projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://apple.doit.wisc.edu/mirrors/amug/linux/linuxppc/sources/tarballs/xscreensaver...
[xscreensaver]
/
driver
/
passwd-pwent.c
diff --git
a/driver/passwd-pwent.c
b/driver/passwd-pwent.c
index 6e83e0f4a5440f757353b2c7dcb108b01a28f42f..a2d5e0c8ac301fa600959591bf57a99c071c2dc9 100644
(file)
--- a/
driver/passwd-pwent.c
+++ b/
driver/passwd-pwent.c
@@
-195,9
+195,15
@@
get_encrypted_passwd(const char *user)
*s = 0;
}
*s = 0;
}
+#ifndef HAVE_PAM
+ /* We only issue this warning if not compiled with support for PAM.
+ If we're using PAM, it's not unheard of that normal pwent passwords
+ would be unavailable. */
+
if (!result)
fprintf (stderr, "%s: couldn't get password of \"%s\"\n",
blurb(), (user ? user : "(null)"));
if (!result)
fprintf (stderr, "%s: couldn't get password of \"%s\"\n",
blurb(), (user ? user : "(null)"));
+#endif /* !HAVE_PAM */
return result;
}
return result;
}
@@
-213,7
+219,7
@@
get_encrypted_passwd(const char *user)
#ifndef VMS
Bool
#ifndef VMS
Bool
-pwent_
lock
_init (int argc, char **argv, Bool verbose_p)
+pwent_
priv
_init (int argc, char **argv, Bool verbose_p)
{
char *u;
{
char *u;
@@
-234,6
+240,17
@@
pwent_lock_init (int argc, char **argv, Bool verbose_p)
}
}
+Bool
+pwent_lock_init (int argc, char **argv, Bool verbose_p)
+{
+ if (encrypted_user_passwd)
+ return True;
+ else
+ return False;
+}
+
+
+
static Bool
passwds_match_p (const char *cleartext, const char *ciphertext)
{
static Bool
passwds_match_p (const char *cleartext, const char *ciphertext)
{