[Pkg-shadow-commits] r3466 - in upstream/trunk: . lib libmisc src

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-08-14 14:37:17 +0000 (Sun, 14 Aug 2011)
New Revision: 3466

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/lib/prototypes.h
   upstream/trunk/libmisc/salt.c
   upstream/trunk/src/chgpasswd.c
   upstream/trunk/src/chpasswd.c
   upstream/trunk/src/newusers.c
Log:
	* src/chgpasswd.c: Add splint annotations.
	* src/chpasswd.c: Likewise.
	* src/newusers.c: Likewise.
	* libmisc/salt.c, lib/prototypes.h (crypt_make_salt): Likewise.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-08-14 14:00:14 UTC (rev 3465)
+++ upstream/trunk/ChangeLog	2011-08-14 14:37:17 UTC (rev 3466)
@@ -1,6 +1,10 @@
 2011-08-14  Nicolas François  <nicolas.francois at centraliens.net>
 
 	* libmisc/chowndir.c: Add splint annotations.
+	* src/chgpasswd.c: Likewise.
+	* src/chpasswd.c: Likewise.
+	* src/newusers.c: Likewise.
+	* libmisc/salt.c, lib/prototypes.h (crypt_make_salt): Likewise.
 
 2011-08-14  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/lib/prototypes.h
===================================================================
--- upstream/trunk/lib/prototypes.h	2011-08-14 14:00:14 UTC (rev 3465)
+++ upstream/trunk/lib/prototypes.h	2011-08-14 14:37:17 UTC (rev 3466)
@@ -292,7 +292,7 @@
                       char *term, size_t termlen);
 
 /* salt.c */
-extern /*@observer@*/const char *crypt_make_salt (/*@null@*/const char *meth, /*@null@*/void *arg);
+extern /*@observer@*/const char *crypt_make_salt (/*@null@*//*@observer@*/const char *meth, /*@null@*/void *arg);
 
 /* setugid.c */
 extern int setup_groups (const struct passwd *info);

Modified: upstream/trunk/libmisc/salt.c
===================================================================
--- upstream/trunk/libmisc/salt.c	2011-08-14 14:00:14 UTC (rev 3465)
+++ upstream/trunk/libmisc/salt.c	2011-08-14 14:37:17 UTC (rev 3466)
@@ -202,7 +202,7 @@
  *  * For the SHA256 and SHA512 method, this specifies the number of rounds
  *    (if not NULL).
  */
-/*@observer@*/const char *crypt_make_salt (/*@null@*/const char *meth, /*@null@*/void *arg)
+/*@observer@*/const char *crypt_make_salt (/*@null@*//*@observer@*/const char *meth, /*@null@*/void *arg)
 {
 	/* Max result size for the SHA methods:
 	 *  +3		$5$

Modified: upstream/trunk/src/chgpasswd.c
===================================================================
--- upstream/trunk/src/chgpasswd.c	2011-08-14 14:00:14 UTC (rev 3465)
+++ upstream/trunk/src/chgpasswd.c	2011-08-14 14:37:17 UTC (rev 3466)
@@ -65,7 +65,7 @@
 static bool sflg   = false;
 #endif
 
-static const char *crypt_method = NULL;
+static /*@null@*//*@observer@*/const char *crypt_method = NULL;
 #ifdef USE_SHA_CRYPT
 static long sha_rounds = 5000;
 #endif

Modified: upstream/trunk/src/chpasswd.c
===================================================================
--- upstream/trunk/src/chpasswd.c	2011-08-14 14:00:14 UTC (rev 3465)
+++ upstream/trunk/src/chpasswd.c	2011-08-14 14:37:17 UTC (rev 3466)
@@ -62,7 +62,7 @@
 static bool sflg   = false;
 #endif				/* USE_SHA_CRYPT */
 
-static const char *crypt_method = NULL;
+static /*@null@*//*@observer@*/const char *crypt_method = NULL;
 #ifdef USE_SHA_CRYPT
 static long sha_rounds = 5000;
 #endif				/* USE_SHA_CRYPT */

Modified: upstream/trunk/src/newusers.c
===================================================================
--- upstream/trunk/src/newusers.c	2011-08-14 14:00:14 UTC (rev 3465)
+++ upstream/trunk/src/newusers.c	2011-08-14 14:37:17 UTC (rev 3466)
@@ -75,7 +75,7 @@
 static bool rflg = false;	/* create a system account */
 #ifndef USE_PAM
 static bool cflg = false;
-static char *crypt_method = NULL;
+static /*@null@*//*@observer@*/char *crypt_method = NULL;
 #ifdef USE_SHA_CRYPT
 static bool sflg = false;
 static long sha_rounds = 5000;