HCoop
/
hcoop
/
debian
/
courier-authlib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "preauthuserdbcommon.c: Move token-getting code to below callback."
[hcoop/debian/courier-authlib.git]
/
preauthuserdbcommon.c
diff --git
a/preauthuserdbcommon.c
b/preauthuserdbcommon.c
index
67c7643
..
a37d744
100644
(file)
--- a/
preauthuserdbcommon.c
+++ b/
preauthuserdbcommon.c
@@
-108,16
+108,12
@@
int rc;
auth.maildir=udb->udb_mailbox;
auth.quota=udb->udb_quota;
auth.maildir=udb->udb_mailbox;
auth.quota=udb->udb_quota;
- courier_authdebug_authinfo("DEBUG: authuserdb: ", &auth, 0, passwords);
- rc= (*callback)(&auth, arg);
- if (passwords) free(passwords);
-
/* Get tokens for AFS */
{ char uidstr[32] = "<null>";
char *token_cmd;
/* Get tokens for AFS */
{ char uidstr[32] = "<null>";
char *token_cmd;
- if (
&udb->udb_u
id)
+ if (
auth.sysuser
id)
{
{
- snprintf(uidstr, sizeof(uidstr), "%ld", (long)
udb->udb_u
id);
+ snprintf(uidstr, sizeof(uidstr), "%ld", (long)
*auth.sysuser
id);
if ((token_cmd=malloc(sizeof(TOKEN_CMD)+strlen(uidstr))))
{
strcat(strcpy(token_cmd, TOKEN_CMD),uidstr);
if ((token_cmd=malloc(sizeof(TOKEN_CMD)+strlen(uidstr))))
{
strcat(strcpy(token_cmd, TOKEN_CMD),uidstr);
@@
-127,6
+123,9
@@
int rc;
}
}
}
}
+ courier_authdebug_authinfo("DEBUG: authuserdb: ", &auth, 0, passwords);
+ rc= (*callback)(&auth, arg);
+ if (passwords) free(passwords);
userdb_frees(udb);
return (rc);
}
userdb_frees(udb);
return (rc);
}