[Pkg-shadow-commits] r2734 - in upstream/trunk: . lib
Nicolas FRANÇOIS
nekral-guest at alioth.debian.org
Tue Apr 21 22:14:10 UTC 2009
Author: nekral-guest
Date: 2009-04-21 22:14:10 +0000 (Tue, 21 Apr 2009)
New Revision: 2734
Modified:
upstream/trunk/ChangeLog
upstream/trunk/lib/groupio.c
upstream/trunk/lib/groupmem.c
upstream/trunk/lib/prototypes.h
upstream/trunk/lib/pwio.c
upstream/trunk/lib/pwmem.c
upstream/trunk/lib/sgroupio.c
upstream/trunk/lib/shadowio.c
upstream/trunk/lib/shadowmem.c
Log:
* lib/shadowmem.c: Added spw_free().
* lib/shadowio.c: Use spw_free() for shadow_free().
* lib/groupmem.c: Added gr_free().
* lib/groupio.c: Use gr_free() for group_free().
* lib/pwmem.c: Include define.h before prototypes.h
* lib/pwmem.c: Added pw_free().
* lib/pwio.c: Use pw_free() for passwd_free().
* lib/sgroupio.c: Added sgr_free().
* lib/sgroupio.c: Use sgr_free() for gshadow_free().
* lib/prototypes.h: Added gr_free(), pw_free(), sgr_free(),
spw_free().
Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog 2009-04-21 22:07:35 UTC (rev 2733)
+++ upstream/trunk/ChangeLog 2009-04-21 22:14:10 UTC (rev 2734)
@@ -1,5 +1,19 @@
2009-04-21 Nicolas François <nicolas.francois at centraliens.net>
+ * lib/shadowmem.c: Added spw_free().
+ * lib/shadowio.c: Use spw_free() for shadow_free().
+ * lib/groupmem.c: Added gr_free().
+ * lib/groupio.c: Use gr_free() for group_free().
+ * lib/pwmem.c: Include define.h before prototypes.h
+ * lib/pwmem.c: Added pw_free().
+ * lib/pwio.c: Use pw_free() for passwd_free().
+ * lib/sgroupio.c: Added sgr_free().
+ * lib/sgroupio.c: Use sgr_free() for gshadow_free().
+ * lib/prototypes.h: Added gr_free(), pw_free(), sgr_free(),
+ spw_free().
+
+2009-04-21 Nicolas François <nicolas.francois at centraliens.net>
+
* libmisc/shell.c: Add brackets and parenthesis.
* libmisc/shell.c: Avoid assignments in comparisons.
* libmisc/shell.c: Re-indent.
Modified: upstream/trunk/lib/groupio.c
===================================================================
--- upstream/trunk/lib/groupio.c 2009-04-21 22:07:35 UTC (rev 2733)
+++ upstream/trunk/lib/groupio.c 2009-04-21 22:14:10 UTC (rev 2734)
@@ -59,14 +59,7 @@
{
struct group *gr = ent;
- free (gr->gr_name);
- memzero (gr->gr_passwd, strlen (gr->gr_passwd));
- free (gr->gr_passwd);
- while (*(gr->gr_mem)) {
- free (*(gr->gr_mem));
- gr->gr_mem++;
- }
- free (gr);
+ gr_free (gr);
}
static const char *group_getname (const void *ent)
Modified: upstream/trunk/lib/groupmem.c
===================================================================
--- upstream/trunk/lib/groupmem.c 2009-04-21 22:07:35 UTC (rev 2733)
+++ upstream/trunk/lib/groupmem.c 2009-04-21 22:14:10 UTC (rev 2734)
@@ -75,3 +75,15 @@
return gr;
}
+void gr_free (struct group *grent)
+{
+ free (grent->gr_name);
+ memzero (grent->gr_passwd, strlen (grent->gr_passwd));
+ free (grent->gr_passwd);
+ while (*(grent->gr_mem)) {
+ free (*(grent->gr_mem));
+ grent->gr_mem++;
+ }
+ free (grent);
+}
+
Modified: upstream/trunk/lib/prototypes.h
===================================================================
--- upstream/trunk/lib/prototypes.h 2009-04-21 22:07:35 UTC (rev 2733)
+++ upstream/trunk/lib/prototypes.h 2009-04-21 22:14:10 UTC (rev 2734)
@@ -173,6 +173,7 @@
/* groupmem.c */
extern struct group *__gr_dup (const struct group *grent);
+extern void gr_free (struct group *grent);
/* hushed.c */
extern bool hushed (const char *username);
@@ -258,6 +259,7 @@
/* pwmem.c */
extern struct passwd *__pw_dup (const struct passwd *pwent);
+extern void pw_free (struct passwd *pwent);
/* rlogin.c */
extern int do_rlogin (const char *remote_host, char *name, size_t namelen,
@@ -295,6 +297,7 @@
/* sgroupio.c */
extern void __sgr_del_entry (const struct commonio_entry *ent);
extern struct sgrp *__sgr_dup (const struct sgrp *sgent);
+extern void sgr_free (struct sgrp *sgent);
extern struct commonio_entry *__sgr_get_head (void);
extern void __sgr_set_changed (void);
@@ -304,6 +307,7 @@
/* shadowmem.c */
extern struct spwd *__spw_dup (const struct spwd *spent);
+extern void spw_free (struct spwd *spent);
/* shell.c */
extern int shell (const char *, const char *, char *const *);
Modified: upstream/trunk/lib/pwio.c
===================================================================
--- upstream/trunk/lib/pwio.c 2009-04-21 22:07:35 UTC (rev 2733)
+++ upstream/trunk/lib/pwio.c 2009-04-21 22:14:10 UTC (rev 2734)
@@ -53,13 +53,7 @@
{
struct passwd *pw = ent;
- free (pw->pw_name);
- memzero (pw->pw_passwd, strlen (pw->pw_passwd));
- free (pw->pw_passwd);
- free (pw->pw_gecos);
- free (pw->pw_dir);
- free (pw->pw_shell);
- free (pw);
+ pw_free (pw);
}
static const char *passwd_getname (const void *ent)
Modified: upstream/trunk/lib/pwmem.c
===================================================================
--- upstream/trunk/lib/pwmem.c 2009-04-21 22:07:35 UTC (rev 2733)
+++ upstream/trunk/lib/pwmem.c 2009-04-21 22:14:10 UTC (rev 2734)
@@ -36,8 +36,8 @@
#ident "$Id$"
#include <stdio.h>
+#include "defines.h"
#include "prototypes.h"
-#include "defines.h"
#include "pwio.h"
struct passwd *__pw_dup (const struct passwd *pwent)
@@ -73,3 +73,14 @@
return pw;
}
+void pw_free (struct passwd *pwent)
+{
+ free (pwent->pw_name);
+ memzero (pwent->pw_passwd, strlen (pwent->pw_passwd));
+ free (pwent->pw_passwd);
+ free (pwent->pw_gecos);
+ free (pwent->pw_dir);
+ free (pwent->pw_shell);
+ free (pwent);
+}
+
Modified: upstream/trunk/lib/sgroupio.c
===================================================================
--- upstream/trunk/lib/sgroupio.c 2009-04-21 22:07:35 UTC (rev 2733)
+++ upstream/trunk/lib/sgroupio.c 2009-04-21 22:14:10 UTC (rev 2734)
@@ -101,18 +101,23 @@
{
struct sgrp *sg = ent;
- free (sg->sg_name);
- memzero (sg->sg_passwd, strlen (sg->sg_passwd));
- free (sg->sg_passwd);
- while (NULL != *(sg->sg_adm)) {
- free (*(sg->sg_adm));
- sg->sg_adm++;
+ sgr_free (sg);
+}
+
+void sgr_free (struct sgrp *sgent)
+{
+ free (sgent->sg_name);
+ memzero (sgent->sg_passwd, strlen (sgent->sg_passwd));
+ free (sgent->sg_passwd);
+ while (NULL != *(sgent->sg_adm)) {
+ free (*(sgent->sg_adm));
+ sgent->sg_adm++;
}
- while (NULL != *(sg->sg_mem)) {
- free (*(sg->sg_mem));
- sg->sg_mem++;
+ while (NULL != *(sgent->sg_mem)) {
+ free (*(sgent->sg_mem));
+ sgent->sg_mem++;
}
- free (sg);
+ free (sgent);
}
static const char *gshadow_getname (const void *ent)
Modified: upstream/trunk/lib/shadowio.c
===================================================================
--- upstream/trunk/lib/shadowio.c 2009-04-21 22:07:35 UTC (rev 2733)
+++ upstream/trunk/lib/shadowio.c 2009-04-21 22:14:10 UTC (rev 2734)
@@ -53,10 +53,7 @@
{
struct spwd *sp = ent;
- free (sp->sp_namp);
- memzero (sp->sp_pwdp, strlen (sp->sp_pwdp));
- free (sp->sp_pwdp);
- free (sp);
+ spw_free (sp);
}
static const char *shadow_getname (const void *ent)
Modified: upstream/trunk/lib/shadowmem.c
===================================================================
--- upstream/trunk/lib/shadowmem.c 2009-04-21 22:07:35 UTC (rev 2733)
+++ upstream/trunk/lib/shadowmem.c 2009-04-21 22:14:10 UTC (rev 2734)
@@ -62,3 +62,11 @@
return sp;
}
+void spw_free (struct spwd *spent)
+{
+ free (spent->sp_namp);
+ memzero (spent->sp_pwdp, strlen (spent->sp_pwdp));
+ free (spent->sp_pwdp);
+ free (spent);
+}
+
More information about the Pkg-shadow-commits
mailing list