projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
[citadel.git]
/
citadel
/
auth.c
diff --git
a/citadel/auth.c
b/citadel/auth.c
index 07f4e9fa701bdc0cc7dc29a60e7f74fd63b38f34..74fa9ebc321b6814ac3bab1bed45e6095b41d6a2 100644
(file)
--- a/
citadel/auth.c
+++ b/
citadel/auth.c
@@
-104,19
+104,19
@@
int validate_password(uid_t uid, const char *pass)
#endif
struct passwd *pw;
int retval = 0;
#endif
struct passwd *pw;
int retval = 0;
- int flags = 0;
-
-#ifdef PAM_DATA_SILENT
- flags = PAM_DATA_SILENT;
-#else
- flags = 0;
-#endif /* PAM_DATA_SILENT */
if ((pw = getpwuid(uid)) == NULL) {
return retval;
}
#ifdef HAVE_PAM_START
if ((pw = getpwuid(uid)) == NULL) {
return retval;
}
#ifdef HAVE_PAM_START
+
+#ifdef PAM_DATA_SILENT
+ int flags = PAM_DATA_SILENT;
+#else
+ int flags = 0;
+#endif /* PAM_DATA_SILENT */
+
pc.conv = conv;
pc.appdata_ptr = &data;
data.name = pw->pw_name;
pc.conv = conv;
pc.appdata_ptr = &data;
data.name = pw->pw_name;