The Samba-Bugzilla – Attachment 11796 Details for
Bug 11700
smbget options should be streamlined with the rest of the Samba utils
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch for 4.4
v4-4-test.patch (text/plain), 21.06 KB, created by
Andreas Schneider
on 2016-01-28 13:36:06 UTC
(
hide
)
Description:
patch for 4.4
Filename:
MIME Type:
Creator:
Andreas Schneider
Created:
2016-01-28 13:36:06 UTC
Size:
21.06 KB
patch
obsolete
>From ee2049f8a987d8f9941ba24a03bfe54828a06525 Mon Sep 17 00:00:00 2001 >From: Andreas Schneider <asn@samba.org> >Date: Wed, 28 Oct 2015 12:37:36 +0100 >Subject: [PATCH 1/5] s3-utils/smbget: Fix option parsing and apply samba > defaults > >BUG: https://bugzilla.samba.org/show_bug.cgi?id=11700 > >Signed-off-by: Andreas Schneider <asn@samba.org> >Reviewed-by: Christian Ambach <ambi@samba.org> > >(cherry picked from commit e1548c5bf77186c72f0257592e9084e3b039b87c) >--- > source3/utils/smbget.c | 173 +++++++++++++++++++++++++++++-------------------- > 1 file changed, 104 insertions(+), 69 deletions(-) > >diff --git a/source3/utils/smbget.c b/source3/utils/smbget.c >index f596a8c..3ced8df 100644 >--- a/source3/utils/smbget.c >+++ b/source3/utils/smbget.c >@@ -23,10 +23,6 @@ > > static int columns = 0; > >-static int debuglevel; >-static char *outputfile; >- >- > static time_t total_start_time = 0; > static off_t total_bytes = 0; > >@@ -42,11 +38,26 @@ static off_t total_bytes = 0; > /* Number of bytes to read at once */ > #define SMB_DEFAULT_BLOCKSIZE 64000 > >-static const char *username = NULL, *password = NULL, *workgroup = NULL; >-static bool nonprompt = false, quiet = false, dots = false, >- keep_permissions = false, verbose = false, send_stdout = false, >- update = false; >-static unsigned int blocksize = SMB_DEFAULT_BLOCKSIZE; >+struct opt { >+ char *workgroup; >+ bool username_specified; >+ char *username; >+ bool password_specified; >+ char *password; >+ >+ char *outputfile; >+ size_t blocksize; >+ >+ bool nonprompt; >+ bool quiet; >+ bool dots; >+ bool keep_permissions; >+ bool verbose; >+ bool send_stdout; >+ bool update; >+ int debuglevel; >+}; >+static struct opt opt; > > static bool smb_download_file(const char *base, const char *name, > bool recursive, bool resume, bool toplevel, >@@ -105,7 +116,7 @@ static void get_auth_data(const char *srv, const char *shr, char *wg, int wglen, > } > hasasked = true; > >- if (!nonprompt && !username) { >+ if (!opt.nonprompt && !opt.username_specified) { > printf("Username for %s at %s [guest] ", shr, srv); > if (fgets(tmp, sizeof(tmp), stdin) == NULL) { > return; >@@ -114,11 +125,11 @@ static void get_auth_data(const char *srv, const char *shr, char *wg, int wglen, > tmp[strlen(tmp) - 1] = '\0'; > } > strncpy(un, tmp, unlen - 1); >- } else if (username) { >- strncpy(un, username, unlen - 1); >+ } else if (opt.username != NULL) { >+ strncpy(un, opt.username, unlen - 1); > } > >- if (!nonprompt && !password) { >+ if (!opt.nonprompt && !opt.password_specified) { > char *prompt; > if (asprintf(&prompt, "Password for %s at %s: ", shr, srv) == > -1) { >@@ -126,12 +137,12 @@ static void get_auth_data(const char *srv, const char *shr, char *wg, int wglen, > } > (void)samba_getpass(prompt, pw, pwlen, false, false); > free(prompt); >- } else if (password) { >- strncpy(pw, password, pwlen - 1); >+ } else if (opt.password != NULL) { >+ strncpy(pw, opt.password, pwlen-1); > } > >- if (workgroup) { >- strncpy(wg, workgroup, wglen - 1); >+ if (opt.workgroup != NULL) { >+ strncpy(wg, opt.workgroup, wglen-1); > } > > /* save the values found for later */ >@@ -139,12 +150,14 @@ static void get_auth_data(const char *srv, const char *shr, char *wg, int wglen, > savedun = SMB_STRDUP(un); > savedpw = SMB_STRDUP(pw); > >- if (!quiet) { >+ if (!opt.quiet) { > char *wgtmp, *usertmp; > wgtmp = SMB_STRNDUP(wg, wglen); > usertmp = SMB_STRNDUP(un, unlen); >- printf("Using workgroup %s, %s%s\n", wgtmp, >- *usertmp ? "user " : "guest user", usertmp); >+ printf("Using workgroup %s, %s%s\n", >+ wgtmp, >+ *usertmp ? "user " : "guest user", >+ usertmp); > free(wgtmp); > free(usertmp); > } >@@ -218,21 +231,21 @@ static int smb_download_dir(const char *base, const char *name, int resume) > break; > > case SMBC_PRINTER_SHARE: >- if (!quiet) { >+ if (!opt.quiet) { > printf("Ignoring printer share %s\n", > dirent->name); > } > break; > > case SMBC_COMMS_SHARE: >- if (!quiet) { >+ if (!opt.quiet) { > printf("Ignoring comms share %s\n", > dirent->name); > } > break; > > case SMBC_IPC_SHARE: >- if (!quiet) { >+ if (!opt.quiet) { > printf("Ignoring ipc$ share %s\n", > dirent->name); > } >@@ -247,7 +260,7 @@ static int smb_download_dir(const char *base, const char *name, int resume) > } > free(tmpname); > >- if (keep_permissions) { >+ if (opt.keep_permissions) { > if (smbc_fstat(dirhandle, &remotestat) < 0) { > fprintf(stderr, > "Unable to get stats on %s on remote server\n", >@@ -420,11 +433,11 @@ static bool smb_download_file(const char *base, const char *name, > } > > /* Open local file according to the mode */ >- if (update) { >+ if (opt.update) { > /* if it is up-to-date, skip */ > if (stat(newpath, &localstat) == 0 && > localstat.st_mtime >= remotestat.st_mtime) { >- if (verbose) { >+ if (opt.verbose) { > printf("%s is up-to-date, skipping\n", newpath); > } > smbc_close(remotehandle); >@@ -440,7 +453,7 @@ static bool smb_download_file(const char *base, const char *name, > return false; > } > /* no offset */ >- } else if (!send_stdout) { >+ } else if (!opt.send_stdout) { > localhandle = open(newpath, O_CREAT | O_NONBLOCK | O_RDWR | > (!resume ? O_EXCL : 0), > 0755); >@@ -463,11 +476,11 @@ static bool smb_download_file(const char *base, const char *name, > > if (localstat.st_size && > localstat.st_size == remotestat.st_size) { >- if (verbose) { >+ if (opt.verbose) { > fprintf(stderr, "%s is already downloaded " > "completely.\n", > path); >- } else if (!quiet) { >+ } else if (!opt.quiet) { > fprintf(stderr, "%s\n", path); > } > smbc_close(remotehandle); >@@ -480,7 +493,7 @@ static bool smb_download_file(const char *base, const char *name, > offset_download = > localstat.st_size - RESUME_DOWNLOAD_OFFSET; > offset_check = localstat.st_size - RESUME_CHECK_OFFSET; >- if (verbose) { >+ if (opt.verbose) { > printf("Trying to start resume of %s at %jd\n" > "At the moment %jd of %jd bytes have " > "been retrieved\n", >@@ -546,7 +559,7 @@ static bool smb_download_file(const char *base, const char *name, > > if (memcmp(checkbuf[0], checkbuf[1], > RESUME_CHECK_SIZE) == 0) { >- if (verbose) { >+ if (opt.verbose) { > printf("Current local and remote file " > "appear to be the same. " > "Starting download from " >@@ -570,7 +583,7 @@ static bool smb_download_file(const char *base, const char *name, > offset_check = 0; > } > >- readbuf = (char *)SMB_MALLOC(blocksize); >+ readbuf = (char *)SMB_MALLOC(opt.blocksize); > if (!readbuf) { > if (localhandle != STDOUT_FILENO) { > close(localhandle); >@@ -580,12 +593,14 @@ static bool smb_download_file(const char *base, const char *name, > > /* Now, download all bytes from offset_download to the end */ > for (curpos = offset_download; curpos < remotestat.st_size; >- curpos += blocksize) { >- ssize_t bytesread = smbc_read(remotehandle, readbuf, blocksize); >+ curpos += opt.blocksize) { >+ ssize_t bytesread = smbc_read(remotehandle, >+ readbuf, >+ opt.blocksize); > if(bytesread < 0) { > fprintf(stderr, >- "Can't read %u bytes at offset %jd, file %s\n", >- blocksize, (intmax_t)curpos, path); >+ "Can't read %zu bytes at offset %jd, file %s\n", >+ opt.blocksize, (intmax_t)curpos, path); > smbc_close(remotehandle); > if (localhandle != STDOUT_FILENO) { > close(localhandle); >@@ -609,9 +624,9 @@ static bool smb_download_file(const char *base, const char *name, > return false; > } > >- if (dots) { >+ if (opt.dots) { > fputc('.', stderr); >- } else if (!quiet) { >+ } else if (!opt.quiet) { > print_progress(newpath, start_time, time_mono(NULL), > start_offset, curpos, > remotestat.st_size); >@@ -620,10 +635,10 @@ static bool smb_download_file(const char *base, const char *name, > > free(readbuf); > >- if (dots) { >+ if (opt.dots) { > fputc('\n', stderr); > printf("%s downloaded\n", path); >- } else if (!quiet) { >+ } else if (!opt.quiet) { > int i; > fprintf(stderr, "\r%s", path); > if (columns) { >@@ -634,7 +649,7 @@ static bool smb_download_file(const char *base, const char *name, > fputc('\n', stderr); > } > >- if (keep_permissions && !send_stdout) { >+ if (opt.keep_permissions && !opt.send_stdout) { > if (fchmod(localhandle, remotestat.st_mode) < 0) { > fprintf(stderr, "Unable to change mode of local " > "file %s to %o\n", >@@ -656,7 +671,7 @@ static void clean_exit(void) > { > char bs[100]; > human_readable(total_bytes, bs, sizeof(bs)); >- if (!quiet) { >+ if (!opt.quiet) { > fprintf(stderr, "Downloaded %s in %lu seconds\n", bs, > (unsigned long)(time_mono(NULL) - total_start_time)); > } >@@ -744,7 +759,7 @@ static int readrcfile(const char *name, const struct poptOption long_options[]) > return 0; > } > >-int main(int argc, const char **argv) >+int main(int argc, char **argv) > { > int c = 0; > const char *file = NULL; >@@ -753,26 +768,32 @@ int main(int argc, const char **argv) > int resume = 0, recursive = 0; > TALLOC_CTX *frame = talloc_stackframe(); > bool ret = true; >+ char *p; >+ const char **argv_const = discard_const_p(const char *, argv); > struct poptOption long_options[] = { >- {"guest", 'a', POPT_ARG_NONE, NULL, 'a', "Work as user guest" }, >- {"encrypt", 'e', POPT_ARG_NONE, NULL, 'e', "Encrypt SMB transport" }, >- {"resume", 'r', POPT_ARG_NONE, &resume, 0, "Automatically resume aborted files" }, >- {"update", 'U', POPT_ARG_NONE, &update, 0, "Download only when remote file is newer than local file or local file is missing"}, >- {"recursive", 'R', POPT_ARG_NONE, &recursive, 0, "Recursively download files" }, >- {"username", 'u', POPT_ARG_STRING, &username, 'u', "Username to use" }, >- {"password", 'p', POPT_ARG_STRING, &password, 'p', "Password to use" }, >- {"workgroup", 'w', POPT_ARG_STRING, &workgroup, 'w', "Workgroup to use (optional)" }, >- {"nonprompt", 'n', POPT_ARG_NONE, &nonprompt, 'n', "Don't ask anything (non-interactive)" }, >- {"debuglevel", 'd', POPT_ARG_INT, &debuglevel, 'd', "Debuglevel to use" }, >- {"outputfile", 'o', POPT_ARG_STRING, &outputfile, 'o', "Write downloaded data to specified file" }, >- {"stdout", 'O', POPT_ARG_NONE, &send_stdout, 'O', "Write data to stdout" }, >- {"dots", 'D', POPT_ARG_NONE, &dots, 'D', "Show dots as progress indication" }, >- {"quiet", 'q', POPT_ARG_NONE, &quiet, 'q', "Be quiet" }, >- {"verbose", 'v', POPT_ARG_NONE, &verbose, 'v', "Be verbose" }, >- {"keep-permissions", 'P', POPT_ARG_NONE, &keep_permissions, 'P', "Keep permissions" }, >- {"blocksize", 'b', POPT_ARG_INT, &blocksize, 'b', "Change number of bytes in a block"}, >- {"rcfile", 'f', POPT_ARG_STRING, NULL, 'f', "Use specified rc file"}, > POPT_AUTOHELP >+ >+ {"workgroup", 'w', POPT_ARG_STRING, &opt.workgroup, 'w', "Workgroup to use (optional)" }, >+ {"user", 'U', POPT_ARG_STRING, &opt.username, 'U', "Username to use" }, >+ {"guest", 'a', POPT_ARG_NONE, NULL, 'a', "Work as user guest" }, >+ >+ {"nonprompt", 'n', POPT_ARG_NONE, &opt.nonprompt, 'n', "Don't ask anything (non-interactive)" }, >+ {"debuglevel", 'd', POPT_ARG_INT, &opt.debuglevel, 'd', "Debuglevel to use" }, >+ >+ {"encrypt", 'e', POPT_ARG_NONE, NULL, 'e', "Encrypt SMB transport" }, >+ {"resume", 'r', POPT_ARG_NONE, &resume, 0, "Automatically resume aborted files" }, >+ {"update", 'u', POPT_ARG_NONE, &opt.update, 0, "Download only when remote file is newer than local file or local file is missing"}, >+ {"recursive", 'R', POPT_ARG_NONE, &recursive, 0, "Recursively download files" }, >+ {"keep-permissions", 'P', POPT_ARG_NONE, &opt.keep_permissions, 'P', "Keep permissions" }, >+ {"blocksize", 'b', POPT_ARG_INT, &opt.blocksize, 'b', "Change number of bytes in a block"}, >+ >+ {"outputfile", 'o', POPT_ARG_STRING, &opt.outputfile, 'o', "Write downloaded data to specified file" }, >+ {"stdout", 'O', POPT_ARG_NONE, &opt.send_stdout, 'O', "Write data to stdout" }, >+ {"dots", 'D', POPT_ARG_NONE, &opt.dots, 'D', "Show dots as progress indication" }, >+ {"quiet", 'q', POPT_ARG_NONE, &opt.quiet, 'q', "Be quiet" }, >+ {"verbose", 'v', POPT_ARG_NONE, &opt.verbose, 'v', "Be verbose" }, >+ {"rcfile", 'f', POPT_ARG_STRING, NULL, 'f', "Use specified rc file"}, >+ > POPT_TABLEEND > }; > poptContext pc; >@@ -794,7 +815,7 @@ int main(int argc, const char **argv) > signal(SIGINT, signal_quit); > signal(SIGTERM, signal_quit); > >- pc = poptGetContext(argv[0], argc, argv, long_options, 0); >+ pc = poptGetContext(argv[0], argc, argv_const, long_options, 0); > > while ((c = poptGetNextOpt(pc)) >= 0) { > switch (c) { >@@ -802,33 +823,47 @@ int main(int argc, const char **argv) > readrcfile(poptGetOptArg(pc), long_options); > break; > case 'a': >- username = ""; >- password = ""; >+ opt.username_specified = true; >+ opt.username = talloc_strdup(frame, ""); >+ opt.password_specified = true; >+ opt.password = talloc_strdup(frame, ""); > break; > case 'e': > smb_encrypt = true; > break; >+ case 'U': >+ opt.username_specified = true; >+ opt.username = talloc_strdup(frame, opt.username); >+ p = strchr(opt.username,'%'); >+ if (p != NULL) { >+ *p = '\0'; >+ opt.password = p + 1; >+ opt.password_specified = true; >+ } >+ break; > } > } > >- if ((send_stdout || resume || outputfile) && update) { >+ if ((opt.send_stdout || resume || opt.outputfile) && opt.update) { > fprintf(stderr, "The -o, -R or -O and -U options can not be " > "used together.\n"); > return 1; > } >- if ((send_stdout || outputfile) && recursive) { >+ if ((opt.send_stdout || opt.outputfile) && recursive) { > fprintf(stderr, "The -o or -O and -R options can not be " > "used together.\n"); > return 1; > } > >- if (outputfile && send_stdout) { >+ if (opt.outputfile && opt.send_stdout) { > fprintf(stderr, "The -o and -O options can not be " > "used together.\n"); > return 1; > } > >- if (smbc_init(get_auth_data, debuglevel) < 0) { >+ popt_burn_cmdline_password(argc, argv); >+ >+ if (smbc_init(get_auth_data, opt.debuglevel) < 0) { > fprintf(stderr, "Unable to initialize libsmbclient\n"); > return 1; > } >@@ -847,7 +882,7 @@ int main(int argc, const char **argv) > while ((file = poptGetArg(pc))) { > if (!recursive) { > ret = smb_download_file(file, "", recursive, resume, >- true, outputfile); >+ true, opt.outputfile); > } else { > ret = smb_download_dir(file, "", resume); > } >-- >2.7.0 > > >From bbc00864cd7aac8d644f3ba569342bce812b3b88 Mon Sep 17 00:00:00 2001 >From: Christian Ambach <ambi@samba.org> >Date: Wed, 27 Jan 2016 21:56:10 +0100 >Subject: [PATCH 2/5] s3-utils/smbget: Fix reading the rcfile > >BUG: https://bugzilla.samba.org/show_bug.cgi?id=11700 > >shortName in POPT_AUTOHELP is null, so the loop always stopped at this >item. > >Signed-off-by: Christian Ambach <ambi@samba.org> >Reviewed-by: Andreas Schneider <asn@samba.org> > >(cherry picked from commit bf1c1ad068a763108f9b8f79431de522783a4302) >--- > source3/utils/smbget.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >diff --git a/source3/utils/smbget.c b/source3/utils/smbget.c >index 3ced8df..e332b2d 100644 >--- a/source3/utils/smbget.c >+++ b/source3/utils/smbget.c >@@ -707,7 +707,7 @@ static int readrcfile(const char *name, const struct poptOption long_options[]) > > found = false; > >- for (i = 0; long_options[i].shortName; i++) { >+ for (i = 0; long_options[i].argInfo; i++) { > if (!long_options[i].longName) { > continue; > } >-- >2.7.0 > > >From 2e43cca4ef04d9f8afe3d1101f3022fab9d80a36 Mon Sep 17 00:00:00 2001 >From: Christian Ambach <ambi@samba.org> >Date: Wed, 27 Jan 2016 22:00:31 +0100 >Subject: [PATCH 3/5] s3-utils/smbget: Fix user-/name password reading from > rcfile > >BUG: https://bugzilla.samba.org/show_bug.cgi?id=11700 > >As the password option is gone, code needs to be able to read password >from user parameter when user%password syntax is used. > >Signed-off-by: Christian Ambach <ambi@samba.org> >Reviewed-by: Andreas Schneider <asn@samba.org> > >(cherry picked from commit cac1086ae12d10a6c424f947045d26badc96d751) >--- > source3/utils/smbget.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > >diff --git a/source3/utils/smbget.c b/source3/utils/smbget.c >index e332b2d..1dd8d77 100644 >--- a/source3/utils/smbget.c >+++ b/source3/utils/smbget.c >@@ -738,6 +738,16 @@ static int readrcfile(const char *name, const struct poptOption long_options[]) > case POPT_ARG_STRING: > stringdata = (char **)long_options[i].arg; > *stringdata = SMB_STRDUP(val); >+ if (long_options[i].shortName == 'U') { >+ char *p; >+ opt.username_specified = true; >+ p = strchr(*stringdata, '%'); >+ if (p != NULL) { >+ *p = '\0'; >+ opt.password = p + 1; >+ opt.password_specified = true; >+ } >+ } > break; > default: > fprintf(stderr, "Invalid variable %s at " >-- >2.7.0 > > >From fb312ae42493b5bd949e286f407ae48104073efd Mon Sep 17 00:00:00 2001 >From: Christian Ambach <ambi@samba.org> >Date: Wed, 27 Jan 2016 22:37:36 +0100 >Subject: [PATCH 4/5] s3-utils/smbget: Update manpages for parameter changes > >BUG: https://bugzilla.samba.org/show_bug.cgi?id=11700 > >Signed-off-by: Christian Ambach <ambi@samba.org> >Reviewed-by: Andreas Schneider <asn@samba.org> > >(cherry picked from commit fbdde9c4651146412c61f03ce916032497f7a546) >--- > docs-xml/manpages/smbget.1.xml | 16 +++++----------- > docs-xml/manpages/smbgetrc.5.xml | 8 ++------ > 2 files changed, 7 insertions(+), 17 deletions(-) > >diff --git a/docs-xml/manpages/smbget.1.xml b/docs-xml/manpages/smbget.1.xml >index 965e229..59e2ffe 100644 >--- a/docs-xml/manpages/smbget.1.xml >+++ b/docs-xml/manpages/smbget.1.xml >@@ -22,8 +22,7 @@ > <arg choice="opt">-a, --guest</arg> > <arg choice="opt">-r, --resume</arg> > <arg choice="opt">-R, --recursive</arg> >- <arg choice="opt">-u, --username=STRING</arg> >- <arg choice="opt">-p, --password=STRING</arg> >+ <arg choice="opt">-U, --username=STRING</arg> > <arg choice="opt">-w, --workgroup=STRING</arg> > <arg choice="opt">-n, --nonprompt</arg> > <arg choice="opt">-d, --debuglevel=INT</arg> >@@ -35,7 +34,7 @@ > <arg choice="opt">-v, --verbose</arg> > <arg choice="opt">-b, --blocksize</arg> > <arg choice="opt">-O, --stdout</arg> >- <arg choice="opt">-U, --update</arg> >+ <arg choice="opt">-u, --update</arg> > <arg choice="opt">-?, --help</arg> > <arg choice="opt">--usage</arg> > <arg choice="req">smb://host/share/path/to/file</arg> >@@ -78,13 +77,8 @@ > </varlistentry> > > <varlistentry> >- <term>-u, --username=STRING</term> >- <listitem><para>Username to use</para></listitem> >- </varlistentry> >- >- <varlistentry> >- <term>-p, --password=STRING</term> >- <listitem><para>Password to use</para></listitem> >+ <term> -U, --username=<replaceable>username[%password]</replaceable></term> >+ <listitem><para>Username (and password) to use</para></listitem> > </varlistentry> > > <varlistentry> >@@ -153,7 +147,7 @@ > </varlistentry> > > <varlistentry> >- <term>-U, --update</term> >+ <term>-u, --update</term> > <listitem><para>Download only when remote file is newer than local file or local file is missing.</para></listitem> > </varlistentry> > >diff --git a/docs-xml/manpages/smbgetrc.5.xml b/docs-xml/manpages/smbgetrc.5.xml >index a1a9b57..f1bb8b5 100644 >--- a/docs-xml/manpages/smbgetrc.5.xml >+++ b/docs-xml/manpages/smbgetrc.5.xml >@@ -53,15 +53,11 @@ > <listitem><para>Whether directories should be downloaded recursively</para></listitem> > </varlistentry> > >- <varlistentry><term>username <replaceable>name</replaceable></term> >- <listitem><para>Username to use when logging in to the remote server. Use an empty string for anonymous access. >+ <varlistentry><term>user <replaceable>name[%password]</replaceable></term> >+ <listitem><para>Username (and password) to use when logging in to the remote server. Use an empty string for anonymous access. > </para></listitem> > </varlistentry> > >- <varlistentry><term>password <replaceable>pass</replaceable></term> >- <listitem><para>Password to use when logging in.</para></listitem> >- </varlistentry> >- > <varlistentry><term>workgroup <replaceable>wg</replaceable></term> > <listitem><para>Workgroup to use when logging in</para></listitem> > </varlistentry> >-- >2.7.0 > > >From b6f11c645707d8785f6ef648eba6e9f0a4328c5e Mon Sep 17 00:00:00 2001 >From: Christian Ambach <ambi@samba.org> >Date: Wed, 27 Jan 2016 22:59:25 +0100 >Subject: [PATCH 5/5] WHATSNEW: update with latest parameter updates for smbget > >BUG: https://bugzilla.samba.org/show_bug.cgi?id=11700 > >Signed-off-by: Christian Ambach <ambi@samba.org> >Reviewed-by: Andreas Schneider <asn@samba.org> > >Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org> >Autobuild-Date(master): Thu Jan 28 13:07:34 CET 2016 on sn-devel-144 > >(cherry picked from commit 9b5198f55234d55c24d265adf072932cfe086f63) >--- > WHATSNEW.txt | 7 +++++++ > 1 file changed, 7 insertions(+) > >diff --git a/WHATSNEW.txt b/WHATSNEW.txt >index 399fb2b..7c748c2 100644 >--- a/WHATSNEW.txt >+++ b/WHATSNEW.txt >@@ -65,6 +65,13 @@ smbstatus > 'smbstatus' was enhanced to show the state of signing and encryption for > sessions and shares. > >+smbget >+------ >+The -u and -p options for user and password were replaced by the -U option that >+accepts username[%password] as in many other tools of the Samba suite. >+Similary, smbgetrc files do not accept username and password options any more, >+only a single "user" option which also accepts user%password combinations. >+ > s4-rpc_server > ------------- > >-- >2.7.0 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=11796">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Flags:
ambi
:
review+
slow
:
review+
Actions:
View
Attachments on
bug 11700
: 11796 |
11830