IFC @ r245178

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

diff --git a/pw/pw.h b/pw/pw.h
index 8635f44ba9d563201584aa2251c91f0a09782779..1ff69a695fab9a360bc004b0825b81983786dc3f 100644 (file)
--- a/pw/pw.h
+++ b/pw/pw.h
@@ -1,26 +1,20 @@
 /*-
 /*-

- * Copyright (c) 1996 by David L. Nugent <davidn@blaze.net.au>.
- * All rights reserved.
+ * Copyright (C) 1996
+ *     David L. Nugent.  All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright

- *    notice, this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified.
+ *    notice, this list of conditions and the following disclaimer.

  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.

- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by David L. Nugent.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.

  *
  *

- * THIS SOFTWARE IS PROVIDED BY THE DAVID L. NUGENT ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY DAVID L. NUGENT AND CONTRIBUTORS ``AS IS'' AND

  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED.  IN NO EVENT SHALL DAVID L. NUGENT BE LIABLE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL DAVID L. NUGENT OR CONTRIBUTORS BE LIABLE

  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)


@@ -29,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *

- *     $Id$
+ * $FreeBSD$

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>


@@ -40,11 +34,14 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.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 <pwd.h>
 #include <grp.h>
 #include <sys/queue.h>

+#include <sysexits.h>

 
 #include "psdate.h"
 
 #include "psdate.h"

+#include "pwupd.h"

 
 enum _mode
 {
 
 enum _mode
 {


@@ -52,6 +49,9 @@ enum _mode
         M_DELETE,
         M_UPDATE,
         M_PRINT,
         M_DELETE,
         M_UPDATE,
         M_PRINT,

+       M_NEXT,
+       M_LOCK,
+       M_UNLOCK,

         M_NUM
 };
 
         M_NUM
 };
 


@@ -62,21 +62,6 @@ enum _which
         W_NUM
 };
 
         W_NUM
 };
 

-enum _excode
-{
-        X_ALLOK,
-        X_CMDERR,
-        X_PERMERR,
-        X_MEMERR,
-        X_NOUPDATE,
-        X_NOTFOUND,
-        X_UPDERROR,
-        X_TOOMANY,
-        X_EXISTS,
-        X_DBERROR,
-        X_CONFIG
-};
-

 struct carg
 {
        int               ch;
 struct carg
 {
        int               ch;


@@ -84,17 +69,19 @@ struct carg
        LIST_ENTRY(carg)  list;
 };
 
        LIST_ENTRY(carg)  list;
 };
 

-extern LIST_HEAD(cargs, carg) arglist;
+LIST_HEAD(cargs, carg);

 
 struct userconf
 {
        int     default_password;       /* Default password for new users? */
        int     reuse_uids;             /* Reuse uids? */
        int     reuse_gids;             /* Reuse gids? */
 
 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 */
        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    *shelldir;              /* Where shells are located */
        char    **shells;               /* List of shells */
        char    *shell_default;         /* Default shell */


@@ -105,37 +92,32 @@ struct userconf
        gid_t   min_gid, max_gid;       /* Allowed range of gids */
        int     expire_days;            /* Days to expiry */
        int     password_days;          /* Days to password expiry */
        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 _PATH_PW_CONF  "/etc/pw.conf"
 #define _UC_MAXLINE    1024
 #define _UC_MAXSHELLS  32
 #define _PATH_PW_CONF  "/etc/pw.conf"
 #define _UC_MAXLINE    1024
 #define _UC_MAXSHELLS  32

-#define _UC_MAXGROUPS  200

 
 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);
 
 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);

-void cmderr(int ec, char const * fmt,...);

 
 int pw_user(struct userconf * cnf, int mode, struct cargs * _args);
 int pw_group(struct userconf * cnf, int mode, struct cargs * _args);
 
 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 addpwent(struct passwd * pwd);
-int delpwent(struct passwd * pwd);
-int chgpwent(char const * login, struct passwd * pwd);
-int fmtpwent(char *buf, struct passwd * pwd);
-
-int addgrent(struct group * grp);
-int delgrent(struct group * grp);
-int chggrent(char const * login, struct group * grp);
-int fmtgrent(char *buf, struct group * grp);
+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 boolean_val(char const * str, int dflt);
 char const *boolean_str(int val);
 char *newstr(char const * p);
 
 
 int boolean_val(char const * str, int dflt);
 char const *boolean_str(int val);
 char *newstr(char const * p);
 

-void pw_log(struct userconf * cnf, int mode, int which, char const * fmt,...);
+void pw_log(struct userconf * cnf, int mode, int which, char const * fmt,...) __printflike(4, 5);

 char *pw_pwcrypt(char *password);
 
 extern const char *Modes[];
 char *pw_pwcrypt(char *password);
 
 extern const char *Modes[];