ummm, well, we took a vote -- it's a void * agian

[unix-history] / usr / src / include / pwd.h

diff --git a/usr/src/include/pwd.h b/usr/src/include/pwd.h
index 924fb91..83ffe47 100644 (file)
--- a/usr/src/include/pwd.h
+++ b/usr/src/include/pwd.h
@@ -4,23 +4,28 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)pwd.h       5.9 (Berkeley) %G%
+ *     @(#)pwd.h       5.12 (Berkeley) %G%

  */
 
  */
 

+#ifndef _PWD_H_
+#define        _PWD_H_
+

 #include <sys/types.h>
 
 #ifndef _POSIX_SOURCE
 #define        _PATH_PASSWD            "/etc/passwd"
 #define        _PATH_MASTERPASSWD      "/etc/master.passwd"
 
 #include <sys/types.h>
 
 #ifndef _POSIX_SOURCE
 #define        _PATH_PASSWD            "/etc/passwd"
 #define        _PATH_MASTERPASSWD      "/etc/master.passwd"
 

-#define        _PATH_MP_DB             "/var/db/pwd"
-#define        _PATH_SMP_DB            "/var/db/spwd"
+#define        _PATH_MP_DB             "/etc/pwd.db"
+#define        _PATH_SMP_DB            "/etc/spwd.db"

 
 #define        _PATH_PWD_MKDB          "/usr/sbin/pwd_mkdb"
 
 
 #define        _PATH_PWD_MKDB          "/usr/sbin/pwd_mkdb"
 

-#define        _PW_KEYBYNAME           '1'
-#define        _PW_KEYBYNUM            '2'
-#define        _PW_KEYBYUID            '3'
+#define        _PW_KEYBYNAME           '1'     /* stored by name */
+#define        _PW_KEYBYNUM            '2'     /* stored by entry in the "file" */
+#define        _PW_KEYBYUID            '3'     /* stored by uid */
+
+#define        _PASSWORD_EFMT1         '_'     /* extended encryption format */

 
 #define        _PASSWORD_LEN           128
 #endif
 
 #define        _PASSWORD_LEN           128
 #endif


@@ -50,3 +55,5 @@ int            setpwent __P((void));
 void            endpwent __P((void));
 #endif
 __END_DECLS
 void            endpwent __P((void));
 #endif
 __END_DECLS

+
+#endif /* !_PWD_H_ */