diff options
| author | Volker Lendecke <vl@samba.org> | 2010-01-24 17:07:24 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-01-24 20:32:17 +0100 |
| commit | 21ec6a6cbd358f36aa9bf5974c5c53b8732cdceb (patch) | |
| tree | cd5ea964d1f0ded20e8e7775003e8266602f1828 | |
| parent | a03a83ad26b2cfa571b18f423915312c29fd33c7 (diff) | |
| download | samba-21ec6a6cbd358f36aa9bf5974c5c53b8732cdceb.tar.gz samba-21ec6a6cbd358f36aa9bf5974c5c53b8732cdceb.tar.bz2 samba-21ec6a6cbd358f36aa9bf5974c5c53b8732cdceb.zip | |
s3: Add -C (--use-ccache) to popt_common_credentials
| -rw-r--r-- | source3/include/popt_common.h | 1 | ||||
| -rw-r--r-- | source3/include/proto.h | 3 | ||||
| -rw-r--r-- | source3/lib/popt_common.c | 7 | ||||
| -rw-r--r-- | source3/lib/util.c | 10 |
4 files changed, 20 insertions, 1 deletions
diff --git a/source3/include/popt_common.h b/source3/include/popt_common.h index 7237ca6754..a6e43d2659 100644 --- a/source3/include/popt_common.h +++ b/source3/include/popt_common.h @@ -55,6 +55,7 @@ struct user_auth_info { bool smb_encrypt; bool use_machine_account; bool fallback_after_kerberos; + bool use_ccache; }; #endif /* _POPT_COMMON_H */ diff --git a/source3/include/proto.h b/source3/include/proto.h index 01372c2587..f0ccc92c46 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1105,6 +1105,9 @@ const char *get_cmdline_auth_info_password(const struct user_auth_info *auth_inf bool set_cmdline_auth_info_signing_state(struct user_auth_info *auth_info, const char *arg); int get_cmdline_auth_info_signing_state(const struct user_auth_info *auth_info); +void set_cmdline_auth_info_use_ccache(struct user_auth_info *auth_info, + bool b); +bool get_cmdline_auth_info_use_ccache(const struct user_auth_info *auth_info); void set_cmdline_auth_info_use_kerberos(struct user_auth_info *auth_info, bool b); bool get_cmdline_auth_info_use_kerberos(const struct user_auth_info *auth_info); diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c index 342309d1a7..060382b930 100644 --- a/source3/lib/popt_common.c +++ b/source3/lib/popt_common.c @@ -473,6 +473,7 @@ static void get_credentials_file(struct user_auth_info *auth_info, * -S,--signing * -P --machine-pass * -e --encrypt + * -C --use-ccache */ @@ -573,7 +574,9 @@ static void popt_common_credentials_callback(poptContext con, case 'e': set_cmdline_auth_info_smb_encrypt(auth_info); break; - + case 'C': + set_cmdline_auth_info_use_ccache(auth_info, true); + break; } } @@ -595,5 +598,7 @@ struct poptOption popt_common_credentials[] = { { "signing", 'S', POPT_ARG_STRING, NULL, 'S', "Set the client signing state", "on|off|required" }, {"machine-pass", 'P', POPT_ARG_NONE, NULL, 'P', "Use stored machine account password" }, {"encrypt", 'e', POPT_ARG_NONE, NULL, 'e', "Encrypt SMB transport (UNIX extended servers only)" }, + {"use-ccache", 'C', POPT_ARG_NONE, NULL, 'C', + "Use the winbind ccache for authentication" }, POPT_TABLEEND }; diff --git a/source3/lib/util.c b/source3/lib/util.c index 007226b5c9..932b5dbd40 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -382,6 +382,16 @@ int get_cmdline_auth_info_signing_state(const struct user_auth_info *auth_info) return auth_info->signing_state; } +void set_cmdline_auth_info_use_ccache(struct user_auth_info *auth_info, bool b) +{ + auth_info->use_ccache = b; +} + +bool get_cmdline_auth_info_use_ccache(const struct user_auth_info *auth_info) +{ + return auth_info->use_ccache; +} + void set_cmdline_auth_info_use_kerberos(struct user_auth_info *auth_info, bool b) { |