pw: (file == NULL) check is always false in read_userconfig(), remove

[pw-darwin.git] / pw / pw.h

diff --git a/pw/pw.h b/pw/pw.h
index 1ff69a695fab9a360bc004b0825b81983786dc3f..1e09722a907c77abee55a0a320299c04781f4e36 100644 (file)
--- a/pw/pw.h
+++ b/pw/pw.h
@@ -1,4 +1,6 @@
 /*-
 /*-

+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *

  * Copyright (C) 1996
  *     David L. Nugent.  All rights reserved.
  *
  * Copyright (C) 1996
  *     David L. Nugent.  All rights reserved.
  *


@@ -26,21 +28,12 @@
  * $FreeBSD$
  */
 
  * $FreeBSD$
  */
 

+#include <sys/stat.h>
+
+#include <inttypes.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdlib.h>

-#include <string.h>
-#include <unistd.h>
-#include <stdarg.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <pwd.h>
-#include <grp.h>
-#include <sys/queue.h>
-#include <sysexits.h>

 
 

-#include "psdate.h"

 #include "pwupd.h"
 
 enum _mode
 #include "pwupd.h"
 
 enum _mode


@@ -55,6 +48,14 @@ enum _mode
         M_NUM
 };
 
         M_NUM
 };
 

+enum _passmode
+{
+       P_NO,
+       P_NONE,
+       P_RANDOM,
+       P_YES
+};
+

 enum _which
 {
         W_USER,
 enum _which
 {
         W_USER,


@@ -62,58 +63,46 @@ enum _which
         W_NUM
 };
 
         W_NUM
 };
 

-struct carg
-{
-       int               ch;
-       char              *val;
-       LIST_ENTRY(carg)  list;
-};
-
-LIST_HEAD(cargs, carg);
-
-struct userconf
-{
-       int     default_password;       /* Default password for new users? */
-       int     reuse_uids;             /* Reuse uids? */
-       int     reuse_gids;             /* Reuse gids? */
-       char    *nispasswd;             /* Path to NIS version of the passwd file */
-       char    *dotdir;                /* Where to obtain skeleton files */
-       char    *newmail;               /* Mail to send to new accounts */
-       char    *logfile;               /* Where to log changes */
-       char    *home;                  /* Where to create home directory */
-       mode_t  homemode;               /* Home directory permissions */
-       char    *shelldir;              /* Where shells are located */
-       char    **shells;               /* List of shells */
-       char    *shell_default;         /* Default shell */
-       char    *default_group;         /* Default group number */
-       char    **groups;               /* Default (additional) groups */
-       char    *default_class;         /* Default user class */
-       uid_t   min_uid, max_uid;       /* Allowed range of uids */
-       gid_t   min_gid, max_gid;       /* Allowed range of gids */
-       int     expire_days;            /* Days to expiry */
-       int     password_days;          /* Days to password expiry */
-       int     numgroups;              /* (internal) size of default_group array */
-};
-

 #define        _DEF_DIRMODE    (S_IRWXU | S_IRWXG | S_IRWXO)
 #define        _DEF_DIRMODE    (S_IRWXU | S_IRWXG | S_IRWXO)

-#define _PATH_PW_CONF  "/etc/pw.conf"
+#define        _PW_CONF        "pw.conf"

 #define _UC_MAXLINE    1024
 #define _UC_MAXSHELLS  32
 
 #define _UC_MAXLINE    1024
 #define _UC_MAXSHELLS  32
 

+struct userconf *get_userconfig(const char *cfg);

 struct userconf *read_userconfig(char const * file);
 struct userconf *read_userconfig(char const * file);

-int write_userconfig(char const * file);
-struct carg *addarg(struct cargs * _args, int ch, char *argstr);
-struct carg *getarg(struct cargs * _args, int ch);
+int write_userconfig(struct userconf *cnf, char const * file);

 
 

-int pw_user(struct userconf * cnf, int mode, struct cargs * _args);
-int pw_group(struct userconf * cnf, int mode, struct cargs * _args);
-char    *pw_checkname(u_char *name, int gecos);
+int pw_group_add(int argc, char **argv, char *name);
+int pw_group_del(int argc, char **argv, char *name);
+int pw_group_mod(int argc, char **argv, char *name);
+int pw_group_next(int argc, char **argv, char *name);
+int pw_group_show(int argc, char **argv, char *name);
+int pw_user_add(int argc, char **argv, char *name);
+int pw_user_add(int argc, char **argv, char *name);
+int pw_user_add(int argc, char **argv, char *name);
+int pw_user_add(int argc, char **argv, char *name);
+int pw_user_del(int argc, char **argv, char *name);
+int pw_user_lock(int argc, char **argv, char *name);
+int pw_user_mod(int argc, char **argv, char *name);
+int pw_user_next(int argc, char **argv, char *name);
+int pw_user_show(int argc, char **argv, char *name);
+int pw_user_unlock(int argc, char **argv, char *name);
+int pw_groupnext(struct userconf *cnf, bool quiet);
+char *pw_checkname(char *name, int gecos);
+uintmax_t pw_checkid(char *nptr, uintmax_t maxval);
+int pw_checkfd(char *nptr);

 
 int addnispwent(const char *path, struct passwd *pwd);
 int delnispwent(const char *path, const char *login);
 int chgnispwent(const char *path, const char *login, struct passwd *pwd);
 
 
 int addnispwent(const char *path, struct passwd *pwd);
 int delnispwent(const char *path, const char *login);
 int chgnispwent(const char *path, const char *login, struct passwd *pwd);
 

+int groupadd(struct userconf *, char *name, gid_t id, char *members, int fd,
+    bool dryrun, bool pretty, bool precrypted);
+
+int nis_update(void);
+

 int boolean_val(char const * str, int dflt);
 int boolean_val(char const * str, int dflt);

+int passwd_val(char const * str, int dflt);

 char const *boolean_str(int val);
 char *newstr(char const * p);
 
 char const *boolean_str(int val);
 char *newstr(char const * p);
 


@@ -122,3 +111,6 @@ char *pw_pwcrypt(char *password);
 
 extern const char *Modes[];
 extern const char *Which[];
 
 extern const char *Modes[];
 extern const char *Which[];

+
+uintmax_t strtounum(const char * __restrict, uintmax_t, uintmax_t,
+    const char ** __restrict);