summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-01-24 17:07:24 +0100
committerKarolin Seeger <kseeger@samba.org>2010-01-26 14:55:35 +0100
commit1fcfa0b772de6da2584b30928d65b8397f0c33ea (patch)
tree2c3458586fa9f3a0f16ae71e9c6f5c73b4ebec4e /source3/lib
parentbef877ab24db8fecd723620023626be50a2981bb (diff)
downloadsamba-1fcfa0b772de6da2584b30928d65b8397f0c33ea.tar.gz
s3: Add -C (--use-ccache) to popt_common_credentials
(cherry picked from commit 58ebc50663a299e16684aa24cfae95954d5a14f0)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/popt_common.c7
-rw-r--r--source3/lib/util.c10
2 files changed, 16 insertions, 1 deletions
diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c
index 342309d1a75..060382b930a 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 5fe7bce144e..50aa4b0cbc4 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)
{