devname and getbsize move in from ps and df

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

diff --git a/usr/src/include/pwd.h b/usr/src/include/pwd.h
index 62fe0f1..d43c82b 100644 (file)
--- a/usr/src/include/pwd.h
+++ b/usr/src/include/pwd.h
@@ -4,25 +4,30 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)pwd.h       5.8 (Berkeley) %G%
+ *     @(#)pwd.h       5.13 (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
+#define        _PASSWORD_LEN           128     /* max length, not counting NULL */

 #endif
 
 struct passwd {
 #endif
 
 struct passwd {


@@ -41,13 +46,14 @@ struct passwd {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS

-struct passwd *getpwuid __P((uid_t));
-struct passwd *getpwnam __P((const char *));
+struct passwd  *getpwuid __P((uid_t));
+struct passwd  *getpwnam __P((const char *));

 #ifndef _POSIX_SOURCE
 #ifndef _POSIX_SOURCE

-struct passwd *getpwent __P((void));
-int setpwent __P((void));
-void endpwent __P((void));
-void setpwfile __P((const char *));
-int setpassent __P((int));
+struct passwd  *getpwent __P((void));
+int             setpassent __P((int));
+int             setpwent __P((void));
+void            endpwent __P((void));

 #endif
 __END_DECLS
 #endif
 __END_DECLS

+
+#endif /* !_PWD_H_ */