diff options
| author | Andreas Schneider <asn@samba.org> | 2013-07-26 15:36:02 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2013-07-26 17:40:25 +0200 |
| commit | f908e6b0c506b9f9ed03dde4696ec6190b0369c0 (patch) | |
| tree | a8aa228aab1c843aa0d0ab7c7df222cd3e2528b4 | |
| parent | a74c7d780cb6a1e8a5a63ebbbcf36fd7cf717ea1 (diff) | |
| download | samba-f908e6b0c506b9f9ed03dde4696ec6190b0369c0.tar.gz samba-f908e6b0c506b9f9ed03dde4696ec6190b0369c0.tar.bz2 samba-f908e6b0c506b9f9ed03dde4696ec6190b0369c0.zip | |
nsswitch: Add OPT_KRB5CCNAME to avoid an error message.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10048
Reviewed-by: Günther Deschner <gd@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Fri Jul 26 17:40:26 CEST 2013 on sn-devel-104
| -rw-r--r-- | nsswitch/wbinfo.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c index cba469e469..c3e3ad3274 100644 --- a/nsswitch/wbinfo.c +++ b/nsswitch/wbinfo.c @@ -2078,7 +2078,8 @@ enum { OPT_LOGOFF, OPT_LOGOFF_USER, OPT_LOGOFF_UID, - OPT_LANMAN + OPT_LANMAN, + OPT_KRB5CCNAME }; int main(int argc, char **argv, char **envp) @@ -2179,7 +2180,7 @@ int main(int argc, char **argv, char **envp) { "krb5auth", 'K', POPT_ARG_STRING, &string_arg, 'K', "authenticate user using Kerberos", "user%password" }, /* destroys wbinfo --help output */ /* "user%password,DOM\\user%password,user@EXAMPLE.COM,EXAMPLE.COM\\user%password" }, */ - { "krb5ccname", 0, POPT_ARG_STRING, &opt_krb5ccname, '0', "authenticate user using Kerberos and specific credential cache type", "krb5ccname" }, + { "krb5ccname", 0, POPT_ARG_STRING, &opt_krb5ccname, OPT_KRB5CCNAME, "authenticate user using Kerberos and specific credential cache type", "krb5ccname" }, #endif { "separator", 0, POPT_ARG_NONE, 0, OPT_SEPARATOR, "Get the active winbind separator", NULL }, { "verbose", 0, POPT_ARG_NONE, 0, OPT_VERBOSE, "Print additional information per command", NULL }, @@ -2635,6 +2636,7 @@ int main(int argc, char **argv, char **envp) case OPT_LANMAN: case OPT_LOGOFF_USER: case OPT_LOGOFF_UID: + case OPT_KRB5CCNAME: break; default: d_fprintf(stderr, "Invalid option\n"); |