sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-05 20:58:40 +03:00
Code

examples: Migrate smb2mount to new cmdline option parser

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andreas Schneider 2021-01-13 14:49:07 +01:00 committed by Andrew Bartlett
parent 06a1861ca8
commit f2b80723d3
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
examples/fuse/smb2mount.c
View File

@ -20,7 +20,7 @@
#include "source3/include/includes.h"
#include "popt.h"
#include "popt_common_cmdline.h"
#include "lib/cmdline/cmdline.h"
#include "client.h"
#include "libsmb/proto.h"
#include "clifuse.h"
@ -57,6 +57,7 @@ int main(int argc, char *argv[])
char *unc, *mountpoint, *server, *share;
struct cli_state *cli;
struct cli_credentials *creds = NULL;
bool ok;
struct poptOption long_options[] = {
POPT_AUTOHELP
@ -68,14 +69,29 @@ int main(int argc, char *argv[])
};
smb_init_locale();
setup_logging(argv[0], DEBUG_STDERR);
ok = samba_cmdline_init(frame,
SAMBA_CMDLINE_CONFIG_CLIENT,
false /* require_smbconf */);
if (!ok) {
DBG_ERR("Failed to init cmdline parser!\n");
TALLOC_FREE(frame);
exit(1);
}
lp_set_cmdline("client min protocol", "SMB2");
lp_set_cmdline("client max protocol", "SMB3_11");
lp_load_global(get_dyn_CONFIGFILE());
load_interfaces();
pc = samba_popt_get_context(getprogname(),
argc,
argv_const,
long_options,
0);
if (pc == NULL) {
DBG_ERR("Failed to setup popt context!\n");
TALLOC_FREE(frame);
exit(1);
}
pc = poptGetContext("smb2mount", argc, argv_const, long_options, 0);
poptSetOtherOptionHelp(pc, "//server1/share1 mountpoint");
while ((opt = poptGetNextOpt(pc)) != -1) {
@ -108,7 +124,7 @@ int main(int argc, char *argv[])
}
poptFreeContext(pc);
popt_burn_cmdline_password(argc, argv);
samba_cmdline_burn(argc, argv);
server = talloc_strdup(frame, unc+2);
if (!server) {
@ -136,7 +152,6 @@ int main(int argc, char *argv[])
return -1;
}
popt_free_cmdline_auth_info();
TALLOC_FREE(frame);
return 0;
}

2
examples/fuse/wscript_build
View File

@ -3,5 +3,5 @@
if bld.env.HAVE_FUSE:
bld.SAMBA_BINARY('smb2mount',
source='smb2mount.c clifuse.c',
deps='smbconf popt_samba3_cmdline libsmb fuse',
deps='smbconf CMDLINE_S3 libsmb fuse',
install=False)