File pam_unix2-2.7.4-retvalmagic.diff of Package pam-modules.import4943

From f0e1dcc08789da62c26236e3bc0e3b68ba6d0fd0 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Wed, 20 Jul 2011 11:16:56 +0200
Subject: [PATCH] catch retval magic by ow-crypt/libxcrypt

Instead of returning NULL ow-crypt's retval magic returns "*0" or
"*1".
---
 src/unix_passwd.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

Index: pam_unix2-2.7.4/src/unix_passwd.c
===================================================================
--- pam_unix2-2.7.4/src/unix_passwd.c.orig
+++ pam_unix2-2.7.4/src/unix_passwd.c
@@ -773,7 +773,9 @@ __do_setpass (pam_handle_t *pamh, int fl
 		       options->use_crypt);
       return PAM_AUTHTOK_ERR;
     }
-  if (newpassword == NULL)
+  if (newpassword == NULL
+  /* catch retval magic by ow-crypt/libxcrypt */
+  || !strcmp(newpassword, "*0") || !strcmp(newpassword, "*1"))
     {
       __write_message (pamh, flags, PAM_ERROR_MSG,
 		       _("crypt_r() returns NULL pointer"));
openSUSE Build Service is sponsored by