Do not expose password if it is empty and PWF_STANDARD format is requested

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

diff --git a/pw/pwupd.h b/pw/pwupd.h
index 457a91ba0697a07b269f1273778ba24397bcf878..728906500f41746e3bfee33494fb1fa99efb5f49 100644 (file)
--- a/pw/pwupd.h
+++ b/pw/pwupd.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *     $Id: pwupd.h,v 1.1.1.2 1996/12/10 23:59:03 joerg Exp $
+ * $FreeBSD$
  */
 
 #ifndef _PWUPD_H_
@@ -35,6 +35,12 @@
 
 #include <sys/cdefs.h>
 
+#if defined(__FreeBSD__)
+#define        RET_SETGRENT    int
+#else
+#define        RET_SETGRENT    void
+#endif
+
 enum updtype
 {
         UPD_DELETE = -1,
@@ -43,7 +49,7 @@ enum updtype
 };
 
 __BEGIN_DECLS
-int fileupdate __P((char const * fname, mode_t fm, char const * nline, char const * pfx, int pfxlen, int updmode));
+int fileupdate(char const * fname, mode_t fm, char const * nline, char const * pfx, int pfxlen, int updmode);
 __END_DECLS
 
 enum pwdfmttype
@@ -54,28 +60,101 @@ enum pwdfmttype
         PWF_MASTER             /* MASTER format with password */
 };
 
-__BEGIN_DECLS
-int addpwent __P((struct passwd * pwd));
-int delpwent __P((struct passwd * pwd));
-int chgpwent __P((char const * login, struct passwd * pwd));
-int fmtpwent __P((char *buf, struct passwd * pwd));
-int fmtpwentry __P((char *buf, struct passwd * pwd, int type));
-
-int addgrent __P((struct group * grp));
-int delgrent __P((struct group * grp));
-int chggrent __P((char const * name, struct group * grp));
-int fmtgrent __P((char **buf, int * buflen, struct group * grp));
-int fmtgrentry __P((char **buf, int * buflen, struct group * grp, int type));
-int editgroups __P((char *name, char **groups));
-__END_DECLS
+struct pwf
+{
+       int                 _altdir;
+       void              (*_setpwent)(void);
+       void              (*_endpwent)(void);
+       struct passwd * (*_getpwent)(void);
+       struct passwd   * (*_getpwuid)(uid_t uid);
+       struct passwd   * (*_getpwnam)(const char * nam);
+       int             (*_pwdb)(char *arg, ...);
+       RET_SETGRENT      (*_setgrent)(void);
+       void              (*_endgrent)(void);
+       struct group  * (*_getgrent)(void);
+       struct group  * (*_getgrgid)(gid_t gid);
+       struct group  * (*_getgrnam)(const char * nam);
+       int               (*_grdb)(char *arg, ...);
+};
 
-#define PWBUFSZ 1024
+extern struct pwf PWF;
+extern struct pwf VPWF;
+
+#define SETPWENT()     PWF._setpwent()
+#define ENDPWENT()     PWF._endpwent()
+#define GETPWENT()     PWF._getpwent()
+#define GETPWUID(uid)  PWF._getpwuid(uid)
+#define GETPWNAM(nam)  PWF._getpwnam(nam)
+#define PWDB(args)     PWF._pwdb(args)
+
+#define SETGRENT()     PWF._setgrent()
+#define ENDGRENT()     PWF._endgrent()
+#define GETGRENT()     PWF._getgrent()
+#define GETGRGID(gid)  PWF._getgrgid(gid)
+#define GETGRNAM(nam)  PWF._getgrnam(nam)
+#define GRDB(args)     PWF._grdb(args)
+
+#define PWALTDIR()     PWF._altdir
+#ifndef _PATH_PWD
+#define _PATH_PWD      "/etc"
+#endif
+#ifndef _GROUP
+#define _GROUP         "group"
+#endif
+#ifndef _PASSWD
+#define _PASSWD        "passwd"
+#endif
+#ifndef _MASTERPASSWD
+#define _MASTERPASSWD  "master.passwd"
+#endif
+#ifndef _GROUP
+#define _GROUP         "group"
+#endif
 
 __BEGIN_DECLS
-void copymkdir __P((char const * dir, char const * skel, mode_t mode, uid_t uid, gid_t gid));
-void rm_r __P((char const * dir, uid_t uid));
-int extendline __P((char **buf, int *buflen, int needed));
-int extendarray __P((char ***buf, int *buflen, int needed));
+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 fmtpwentry(char *buf, struct passwd * pwd, int type);
+
+int setpwdir(const char * dir);
+char * getpwpath(char const * file);
+int pwdb(char *arg, ...);
+
+int addgrent(struct group * grp);
+int delgrent(struct group * grp);
+int chggrent(char const * name, struct group * grp);
+int fmtgrent(char **buf, int * buflen, struct group * grp);
+int fmtgrentry(char **buf, int * buflen, struct group * grp, int type);
+int editgroups(char *name, char **groups);
+
+int setgrdir(const char * dir);
+char * getgrpath(const char *file);
+int grdb(char *arg, ...);
+
+void vsetpwent(void);
+void vendpwent(void);
+struct passwd * vgetpwent(void);
+struct passwd * vgetpwuid(uid_t uid);
+struct passwd * vgetpwnam(const char * nam);
+struct passwd * vgetpwent(void);
+int             vpwdb(char *arg, ...);
+
+struct group * vgetgrent(void);
+struct group * vgetgrgid(gid_t gid);
+struct group * vgetgrnam(const char * nam);
+struct group * vgetgrent(void);
+int           vgrdb(char *arg, ...);
+RET_SETGRENT   vsetgrent(void);
+void           vendgrent(void);
+
+void copymkdir(char const * dir, char const * skel, mode_t mode, uid_t uid, gid_t gid);
+void rm_r(char const * dir, uid_t uid);
+int extendline(char **buf, int *buflen, int needed);
+int extendarray(char ***buf, int *buflen, int needed);
 __END_DECLS
 
+#define PWBUFSZ 1024
+
 #endif                         /* !_PWUPD_H */