sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

nsswitch: Add OPT_KRB5CCNAME to avoid an error message.

Browse Source 
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
This commit is contained in:
Andreas Schneider 2013-07-26 15:36:02 +02:00 committed by Andreas Schneider
parent a74c7d780c
commit f908e6b0c5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nsswitch/wbinfo.c
View File

@ -2078,7 +2078,8 @@ enum {
OPT_LOGOFF, OPT_LOGOFF,
OPT_LOGOFF_USER, OPT_LOGOFF_USER,
OPT_LOGOFF_UID, OPT_LOGOFF_UID,
OPT_LANMAN OPT_LANMAN,
OPT_KRB5CCNAME
}; };
int main(int argc, char **argv, char **envp) 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" }, { "krb5auth", 'K', POPT_ARG_STRING, &string_arg, 'K', "authenticate user using Kerberos", "user%password" },
/* destroys wbinfo --help output */ /* destroys wbinfo --help output */
/* "user%password,DOM\\user%password,user@EXAMPLE.COM,EXAMPLE.COM\\user%password" }, */ /* "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 #endif
{ "separator", 0, POPT_ARG_NONE, 0, OPT_SEPARATOR, "Get the active winbind separator", NULL }, { "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 }, { "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_LANMAN:
case OPT_LOGOFF_USER: case OPT_LOGOFF_USER:
case OPT_LOGOFF_UID: case OPT_LOGOFF_UID:
case OPT_KRB5CCNAME:
break; break;
default: default:
d_fprintf(stderr, "Invalid option\n"); d_fprintf(stderr, "Invalid option\n");