Libc-391.2.6.tar.gz

[apple/libc.git] / include / pwd.h

diff --git a/include/pwd.h b/include/pwd.h
index 5aacf288dd39836652dfe80474bf4739e2f178fa..83d87a70f3e39d3a0cc7f60f4e1131bceb626a63 100644 (file)
--- a/include/pwd.h
+++ b/include/pwd.h
@@ -66,15 +66,35 @@
 #ifndef _PWD_H_
 #define        _PWD_H_
 
 #ifndef _PWD_H_
 #define        _PWD_H_
 

-#include <sys/types.h>
+#include <_types.h>

 
 

-#ifndef _POSIX_SOURCE
+#ifndef _GID_T
+typedef __darwin_gid_t         gid_t;
+#define _GID_T
+#endif
+
+#ifndef _SIZE_T
+#define _SIZE_T
+typedef        __darwin_size_t         size_t;
+#endif
+
+#ifndef _UID_T
+typedef __darwin_uid_t         uid_t;
+#define _UID_T
+#endif
+
+#ifndef _POSIX_C_SOURCE
+#define        _PATH_PWD               "/etc"

 #define        _PATH_PASSWD            "/etc/passwd"
 #define        _PATH_PASSWD            "/etc/passwd"

+#define        _PASSWD                 "passwd"

 #define        _PATH_MASTERPASSWD      "/etc/master.passwd"
 #define        _PATH_MASTERPASSWD_LOCK "/etc/ptmp"
 #define        _PATH_MASTERPASSWD      "/etc/master.passwd"
 #define        _PATH_MASTERPASSWD_LOCK "/etc/ptmp"

+#define        _MASTERPASSWD           "master.passwd"

 
 #define        _PATH_MP_DB             "/etc/pwd.db"
 
 #define        _PATH_MP_DB             "/etc/pwd.db"

+#define        _MP_DB                  "pwd.db"

 #define        _PATH_SMP_DB            "/etc/spwd.db"
 #define        _PATH_SMP_DB            "/etc/spwd.db"

+#define        _SMP_DB                 "spwd.db"

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


@@ -101,12 +121,12 @@ struct passwd {
        char    *pw_passwd;             /* encrypted password */
        uid_t   pw_uid;                 /* user uid */
        gid_t   pw_gid;                 /* user gid */
        char    *pw_passwd;             /* encrypted password */
        uid_t   pw_uid;                 /* user uid */
        gid_t   pw_gid;                 /* user gid */

-       time_t  pw_change;              /* password change time */
+       __darwin_time_t pw_change;              /* password change time */

        char    *pw_class;              /* user access class */
        char    *pw_gecos;              /* Honeywell login info */
        char    *pw_dir;                /* home directory */
        char    *pw_shell;              /* default shell */
        char    *pw_class;              /* user access class */
        char    *pw_gecos;              /* Honeywell login info */
        char    *pw_dir;                /* home directory */
        char    *pw_shell;              /* default shell */

-       time_t  pw_expire;              /* account expiration */
+       __darwin_time_t pw_expire;              /* account expiration */

 };
 
 #include <sys/cdefs.h>
 };
 
 #include <sys/cdefs.h>


@@ -116,15 +136,13 @@ struct passwd     *getpwuid(uid_t);
 struct passwd  *getpwnam(const char *);
 int             getpwuid_r(uid_t, struct passwd *, char *, size_t, struct passwd **);
 int             getpwnam_r(const char *, struct passwd *, char *, size_t, struct passwd **);
 struct passwd  *getpwnam(const char *);
 int             getpwuid_r(uid_t, struct passwd *, char *, size_t, struct passwd **);
 int             getpwnam_r(const char *, struct passwd *, char *, size_t, struct passwd **);

-#ifndef _POSIX_SOURCE

 struct passwd  *getpwent(void);
 struct passwd  *getpwent(void);

-#ifndef _XOPEN_SOURCE
+#if !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)

 int             setpassent(int);
 char           *user_from_uid(uid_t, int);
 #endif
 int             setpwent(void);
 void            endpwent(void);
 int             setpassent(int);
 char           *user_from_uid(uid_t, int);
 #endif
 int             setpwent(void);
 void            endpwent(void);

-#endif

 __END_DECLS
 
 #endif /* !_PWD_H_ */
 __END_DECLS
 
 #endif /* !_PWD_H_ */