New upstream version 0.99.7.1

1 files changed, 49 insertions, 33 deletions

diff --git a/Linux-PAM/libpam/pam_misc.c b/Linux-PAM/libpam/pam_misc.c
index cb0572b1..770c9cce 100644
--- a/Linux-PAM/libpam/pam_misc.c
+++ b/Linux-PAM/libpam/pam_misc.c
@@ -1,7 +1,38 @@
-/* pam_misc.c -- This is random stuff */
-
-/*
- * $Id: pam_misc.c,v 1.4 2003/07/13 20:01:44 vorlon Exp $
+/* pam_misc.c -- This is random stuff
+ *
+ * Copyright (c) Andrew G. Morgan <morgan@kernel.org> 2000-2003
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * ALTERNATIVELY, this product may be distributed under the terms of
+ * the GNU Public License, in which case the provisions of the GPL are
+ * required INSTEAD OF the above restrictions.  (This clause is
+ * necessary due to a potential bad interaction between the GPL and
+ * the restrictions contained in a BSD-style copyright.)
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "pam_private.h"
@@ -13,19 +44,6 @@
 #include <syslog.h>
 #include <ctype.h>
 
-/* caseless string comparison: POSIX does not define this.. */
-int _pam_strCMP(const char *s, const char *t)
-{
-    int cf;
-
-    do {
-	cf = tolower(*s) - tolower(*t);
-	++t;
-    } while (!cf && *s++);
-
-    return cf;
-}
-
 char *_pam_StrTok(char *from, const char *format, char **next)
 /*
  * this function is a variant of the standard strtok, it differs in that
@@ -104,16 +122,14 @@ char *_pam_strdup(const char *x)
      register char *new=NULL;
 
      if (x != NULL) {
-	  register int i;
+	  register int len;
 
-	  for (i=0; x[i]; ++i);                       /* length of string */
-	  if ((new = malloc(++i)) == NULL) {
-	       i = 0;
-	       _pam_system_log(LOG_CRIT, "_pam_strdup: failed to get memory");
+	  len = strlen (x) + 1;  /* length of string including NUL */
+	  if ((new = malloc(len)) == NULL) {
+	       len = 0;
+	       pam_syslog(NULL, LOG_CRIT, "_pam_strdup: failed to get memory");
 	  } else {
-	       while (i-- > 0) {
-		    new[i] = x[i];
-	       }
+	       strcpy (new, x);
 	  }
 	  x = NULL;
      }
@@ -143,15 +159,15 @@ int _pam_mkargv(char *s, char ***argv, int *argc)
     l = strlen(s);
     if (l) {
 	if ((sbuf = sbuf_start = _pam_strdup(s)) == NULL) {
-	    _pam_system_log(LOG_CRIT,
-			    "pam_mkargv: null returned by _pam_strdup");
+	    pam_syslog(NULL, LOG_CRIT,
+		       "pam_mkargv: null returned by _pam_strdup");
 	    D(("arg NULL"));
 	} else {
 	    /* Overkill on the malloc, but not large */
 	    argvlen = (l + 1) * ((sizeof(char)) + sizeof(char *));
 	    if ((our_argv = argvbuf = malloc(argvlen)) == NULL) {
-		_pam_system_log(LOG_CRIT,
-				"pam_mkargv: null returned by malloc");
+		pam_syslog(NULL, LOG_CRIT,
+			   "pam_mkargv: null returned by malloc");
 	    } else {
 		char *tmp=NULL;
 
@@ -170,11 +186,11 @@ int _pam_mkargv(char *s, char ***argv, int *argc)
 		    sbuf = NULL;
 		    D(("loop again?"));
 		}
-		_pam_drop(sbuf_start);
 	    }
+	    _pam_drop(sbuf_start);
 	}
     }
-    
+
     *argv = our_argv;
 
     D(("_pam_mkargv returned"));
@@ -256,7 +272,7 @@ void _pam_parse_control(int *control_array, char *tok)
 	    error = "expecting '='";
 	    goto parse_error;
 	}
-	
+
 	/* skip leading space */
 	while (isspace((int)*tok) && *++tok);
 	if (!*tok) {
@@ -315,7 +331,7 @@ void _pam_parse_control(int *control_array, char *tok)
 
 parse_error:
     /* treat everything as bad */
-    _pam_system_log(LOG_ERR, "pam_parse: %s; [...%s]", error, tok);
+    pam_syslog(NULL, LOG_ERR, "pam_parse: %s; [...%s]", error, tok);
     for (ret=0; ret<_PAM_RETURN_VALUES; control_array[ret++]=_PAM_ACTION_BAD);
 
 }