auth:creds: Add command line function for standard password callback

Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>

diff --git a/auth/credentials/credentials.h b/auth/credentials/credentials.h
index 1fff37e815427982b9f958ff7b5a861116c1fe87..1802e3835942be369f12a6239e29acb078a357fd 100644 (file)
--- a/auth/credentials/credentials.h
+++ b/auth/credentials/credentials.h
@@ -315,6 +315,8 @@ bool cli_credentials_set_smb_encryption(struct cli_credentials *cred,
 enum smb_encryption_setting
 cli_credentials_get_smb_encryption(struct cli_credentials *cred);
 
+bool cli_credentials_set_cmdline_callbacks(struct cli_credentials *cred);
+
 void cli_credentials_dump(struct cli_credentials *creds);
 
 /**

diff --git a/auth/credentials/credentials_cmdline.c b/auth/credentials/credentials_cmdline.c
new file mode 100644 (file)
index 0000000..11b1ab9
--- /dev/null
+++ b/auth/credentials/credentials_cmdline.c
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2005      Jelmer Vernooij <jelmer@samba.org>
+ * Copyright (c) 2016      Stefan Metzmacher <metze@samba.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "includes.h"
+#include "system/filesys.h"
+#include "auth/credentials/credentials.h"
+
+static const char *cmdline_get_userpassword(struct cli_credentials *creds)
+{
+       TALLOC_CTX *frame = talloc_stackframe();
+       const char *name = NULL;
+       char *label = NULL;
+       char *ret = NULL;
+       char pwd[256] = {0};
+       int rc;
+
+       name = cli_credentials_get_unparsed_name(creds, frame);
+       if (name == NULL) {
+               goto fail;
+       }
+       label = talloc_asprintf(frame, "Password for [%s]:", name);
+       if (label == NULL) {
+               goto fail;
+       }
+       rc = samba_getpass(label, pwd, sizeof(pwd), false, false);
+       if (rc != 0) {
+               goto fail;
+       }
+       ret = talloc_strdup(creds, pwd);
+       if (ret == NULL) {
+               goto fail;
+       }
+       talloc_set_name_const(ret, __location__);
+fail:
+       ZERO_STRUCT(pwd);
+       TALLOC_FREE(frame);
+       return ret;
+}
+
+/**
+ * @brief Set the command line password callback.
+ *
+ * This will set the callback to get the password from the command prompt or
+ * read it from 'stdin'.
+ *
+ * @param[in]  cred   The credential context.
+ *
+ * @return On success true, false otherwise.
+ */
+bool cli_credentials_set_cmdline_callbacks(struct cli_credentials *cred)
+{
+       /*
+        * The there is no tty, then we will try to read the password from
+        * stdin.
+        */
+       return cli_credentials_set_password_callback(cred,
+                                                    cmdline_get_userpassword);
+}

diff --git a/auth/credentials/wscript_build b/auth/credentials/wscript_build
index 46111164b36764aa61129aca5eb1056fd1a4f3cb..06536651d375967ae504a32014f8e54dcc122e1b 100644 (file)
--- a/auth/credentials/wscript_build
+++ b/auth/credentials/wscript_build
@@ -23,6 +23,10 @@ bld.SAMBA_SUBSYSTEM('CREDENTIALS_NTLM',
        source='credentials_ntlm.c',
        deps='samba-credentials GNUTLS_HELPERS')
 
+bld.SAMBA_SUBSYSTEM('CREDENTIALS_CMDLINE',
+                    source='credentials_cmdline.c',
+                    deps='samba-credentials')
+
 pytalloc_util = bld.pyembed_libname('pytalloc-util')
 pyparam_util = bld.pyembed_libname('pyparam_util')