[SCM] Samba Shared Repository - branch master updated
Volker Lendecke
vlendec at samba.org
Wed Jan 13 21:33:01 UTC 2021
The branch, master has been updated
via 181afa9f68c s3:libsmb: Use cli_credentials directly
via 78c4043a28c s3:libsmb: Pass cli_credentials to get_ipc_connect_master_ip()
via be18d600f7e s3:libsmb: Pass cli_credentials to get_ipc_connect()
via ce3a3c7eab3 s3:waf: Do not link tevent_glib_glue_test against popt_samba3
via 999cbc47a71 s3:waf: Do not link smbspool against popt_samba3
via 0f4827944bf s3:utils: Remove unused popt_common.h header from log2pcaphex.c
via e8eecc8a9e8 s3:utils: Remove unused popt_common.h header from net_vfs.c
via e0ef27f03d2 s3:utils: Remove unused popt_common.h header from net_rpc_shell.c
via c6ce7f2def3 s3:utils: Fix header and deps of mvxattr
via 33806a9ed95 s3:utils: Remove unused header and deps from destroy_netlogon_creds_cli
from 39ce7332109 s3: smbd: Add call to conn_setup_case_options() to create_conn_struct_as_root().
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 181afa9f68ca7ed0a60ac69f5ad62ee70d89a599
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jan 13 15:46:22 2021 +0100
s3:libsmb: Use cli_credentials directly
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
Autobuild-User(master): Volker Lendecke <vl at samba.org>
Autobuild-Date(master): Wed Jan 13 21:32:52 UTC 2021 on sn-devel-184
commit 78c4043a28cebfaeaaab2465a74d03f225d48b60
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jan 13 15:40:08 2021 +0100
s3:libsmb: Pass cli_credentials to get_ipc_connect_master_ip()
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit be18d600f7ed302868ae23fe72b44161e792924e
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jan 13 15:35:11 2021 +0100
s3:libsmb: Pass cli_credentials to get_ipc_connect()
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit ce3a3c7eab34ce849b9db7c073e9743e433c255c
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jan 13 14:59:20 2021 +0100
s3:waf: Do not link tevent_glib_glue_test against popt_samba3
This isn't used at all.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 999cbc47a71596f9f67196e8f15334df6ee1b698
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jan 13 14:58:10 2021 +0100
s3:waf: Do not link smbspool against popt_samba3
This isn't used at all.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 0f4827944bf6241b3823e41b15f9124fbe7539d5
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jan 13 13:35:20 2021 +0100
s3:utils: Remove unused popt_common.h header from log2pcaphex.c
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit e8eecc8a9e84ba2c342e77723ca26d0de03429cb
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jan 13 13:23:47 2021 +0100
s3:utils: Remove unused popt_common.h header from net_vfs.c
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit e0ef27f03d2b93f1273d9c4327c607bacb4e8990
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jan 13 09:31:41 2021 +0100
s3:utils: Remove unused popt_common.h header from net_rpc_shell.c
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit c6ce7f2def3e9fa4e649522b8ba9f44ef8f61ada
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jan 13 09:11:04 2021 +0100
s3:utils: Fix header and deps of mvxattr
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 33806a9ed95006491a1a576d6b5182c32270c82e
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jan 13 09:04:01 2021 +0100
s3:utils: Remove unused header and deps from destroy_netlogon_creds_cli
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/libsmb/cliconnect.c | 11 +++++------
source3/libsmb/libsmb_dir.c | 13 +++++++------
source3/libsmb/proto.h | 4 ++--
source3/utils/destroy_netlogon_creds_cli.c | 1 -
source3/utils/log2pcaphex.c | 2 +-
source3/utils/mvxattr.c | 2 +-
source3/utils/net_rpc_shell.c | 3 ++-
source3/utils/net_vfs.c | 1 -
source3/utils/wscript_build | 5 +++--
source3/wscript_build | 2 --
10 files changed, 21 insertions(+), 23 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 8ee60df0c99..b95b14b018c 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -23,7 +23,6 @@
#include "includes.h"
#include "libsmb/libsmb.h"
#include "libsmb/namequery.h"
-#include "auth_info.h"
#include "../libcli/auth/libcli_auth.h"
#include "../libcli/auth/spnego.h"
#include "smb_krb5.h"
@@ -3844,7 +3843,7 @@ fail:
struct cli_state *get_ipc_connect(char *server,
struct sockaddr_storage *server_ss,
- const struct user_auth_info *user_info)
+ struct cli_credentials *creds)
{
struct cli_state *cli;
NTSTATUS nt_status;
@@ -3854,7 +3853,7 @@ struct cli_state *get_ipc_connect(char *server,
flags |= CLI_FULL_CONNECTION_IPC;
nt_status = cli_full_connection_creds(&cli, NULL, server, server_ss, 0, "IPC$", "IPC",
- get_cmdline_auth_info_creds(user_info),
+ creds,
flags);
if (NT_STATUS_IS_OK(nt_status)) {
@@ -3865,7 +3864,7 @@ struct cli_state *get_ipc_connect(char *server,
fstring remote_name;
if (name_status_find("*", 0, 0, server_ss, remote_name)) {
- cli = get_ipc_connect(remote_name, server_ss, user_info);
+ cli = get_ipc_connect(remote_name, server_ss, creds);
if (cli)
return cli;
}
@@ -3887,7 +3886,7 @@ struct cli_state *get_ipc_connect(char *server,
struct cli_state *get_ipc_connect_master_ip(TALLOC_CTX *ctx,
struct sockaddr_storage *mb_ip,
- const struct user_auth_info *user_info,
+ struct cli_credentials *creds,
char **pp_workgroup_out)
{
char addr[INET6_ADDRSTRLEN];
@@ -3930,7 +3929,7 @@ struct cli_state *get_ipc_connect_master_ip(TALLOC_CTX *ctx,
DEBUG(4, ("found master browser %s, %s\n", name, addr));
print_sockaddr(addr, sizeof(addr), &server_ss);
- cli = get_ipc_connect(addr, &server_ss, user_info);
+ cli = get_ipc_connect(addr, &server_ss, creds);
return cli;
}
diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c
index f1596b743ef..eb12a6c2ebe 100644
--- a/source3/libsmb/libsmb_dir.c
+++ b/source3/libsmb/libsmb_dir.c
@@ -564,7 +564,7 @@ SMBC_opendir_ctx(SMBCCTX *context,
size_t max_lmb_count;
struct sockaddr_storage *ip_list;
struct sockaddr_storage server_addr;
- struct user_auth_info *u_info;
+ struct cli_credentials *creds = NULL;
NTSTATUS status;
if (share[0] != (char)0 || path[0] != (char)0) {
@@ -583,8 +583,8 @@ SMBC_opendir_ctx(SMBCCTX *context,
? INT_MAX
: smbc_getOptionBrowseMaxLmbCount(context));
- u_info = user_auth_info_init(frame);
- if (u_info == NULL) {
+ creds = cli_credentials_init(frame);
+ if (creds == NULL) {
if (dir) {
SAFE_FREE(dir->fname);
SAFE_FREE(dir);
@@ -593,8 +593,9 @@ SMBC_opendir_ctx(SMBCCTX *context,
errno = ENOMEM;
return NULL;
}
- set_cmdline_auth_info_username(u_info, user);
- set_cmdline_auth_info_password(u_info, password);
+
+ (void)cli_credentials_set_username(creds, user, CRED_SPECIFIED);
+ (void)cli_credentials_set_password(creds, password, CRED_SPECIFIED);
/*
* We have server and share and path empty but options
@@ -654,7 +655,7 @@ SMBC_opendir_ctx(SMBCCTX *context,
cli = get_ipc_connect_master_ip(talloc_tos(),
&ip_list[i],
- u_info,
+ creds,
&wg_ptr);
/* cli == NULL is the master browser refused to talk or
could not be found */
diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index df5be718f17..dfa0969b309 100644
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -115,10 +115,10 @@ NTSTATUS cli_raw_tcon(struct cli_state *cli,
uint16_t *max_xmit, uint16_t *tid);
struct cli_state *get_ipc_connect(char *server,
struct sockaddr_storage *server_ss,
- const struct user_auth_info *user_info);
+ struct cli_credentials *creds);
struct cli_state *get_ipc_connect_master_ip(TALLOC_CTX *ctx,
struct sockaddr_storage *mb_ip,
- const struct user_auth_info *user_info,
+ struct cli_credentials *creds,
char **pp_workgroup_out);
/* The following definitions come from libsmb/clidfs.c */
diff --git a/source3/utils/destroy_netlogon_creds_cli.c b/source3/utils/destroy_netlogon_creds_cli.c
index 137ac8393e7..f28cad527df 100644
--- a/source3/utils/destroy_netlogon_creds_cli.c
+++ b/source3/utils/destroy_netlogon_creds_cli.c
@@ -23,7 +23,6 @@
#include <tevent.h>
#include "messages.h"
#include "lib/util/talloc_stack.h"
-#include "popt_common.h"
#include "lib/param/loadparm.h"
#include "lib/param/param.h"
#include "libcli/auth/netlogon_creds_cli.h"
diff --git a/source3/utils/log2pcaphex.c b/source3/utils/log2pcaphex.c
index 6a9b89f1c07..f8b5246a43e 100644
--- a/source3/utils/log2pcaphex.c
+++ b/source3/utils/log2pcaphex.c
@@ -51,7 +51,7 @@
*/
#include "includes.h"
-#include "popt_common.h"
+#include <popt.h>
/* We don't care about the paranoid malloc checker in this standalone
program */
diff --git a/source3/utils/mvxattr.c b/source3/utils/mvxattr.c
index d15025b800f..7fad10bc60f 100644
--- a/source3/utils/mvxattr.c
+++ b/source3/utils/mvxattr.c
@@ -19,7 +19,7 @@
#include "includes.h"
#include "system/filesys.h"
-#include "popt_common.h"
+#include <popt.h>
#include <ftw.h>
static struct rename_xattr_state {
diff --git a/source3/utils/net_rpc_shell.c b/source3/utils/net_rpc_shell.c
index f07ba779bba..2569bb06869 100644
--- a/source3/utils/net_rpc_shell.c
+++ b/source3/utils/net_rpc_shell.c
@@ -19,7 +19,6 @@
#include "includes.h"
-#include "popt_common.h"
#include "utils/net.h"
#include "rpc_client/cli_pipe.h"
#include "../librpc/gen_ndr/ndr_samr.h"
@@ -29,6 +28,8 @@
#include "libsmb/libsmb.h"
#include "libcli/security/dom_sid.h"
+#include <popt.h>
+
static NTSTATUS rpc_sh_info(struct net_context *c,
TALLOC_CTX *mem_ctx, struct rpc_sh_ctx *ctx,
struct rpc_pipe_client *pipe_hnd,
diff --git a/source3/utils/net_vfs.c b/source3/utils/net_vfs.c
index 5b8e1fc4e04..62be0a44ca2 100644
--- a/source3/utils/net_vfs.c
+++ b/source3/utils/net_vfs.c
@@ -23,7 +23,6 @@
#include <ftw.h>
#include "system/filesys.h"
#include "system/passwd.h"
-#include "popt_common.h"
#include "lib/param/loadparm.h"
#include "lib/param/param.h"
#include "libcli/security/security.h"
diff --git a/source3/utils/wscript_build b/source3/utils/wscript_build
index 6157cac9050..a541163141d 100644
--- a/source3/utils/wscript_build
+++ b/source3/utils/wscript_build
@@ -279,7 +279,8 @@ bld.SAMBA3_BINARY('mvxattr',
source='mvxattr.c',
deps='''
talloc
- popt_samba3
+ popt
+ samba-util
''',
enabled=bld.env.build_mvxattr)
@@ -287,7 +288,7 @@ bld.SAMBA3_BINARY('destroy_netlogon_creds_cli',
source='destroy_netlogon_creds_cli.c',
deps = '''
talloc
- popt_samba3
+ smbconf
NETLOGON_CREDS_CLI
''',
install=False)
diff --git a/source3/wscript_build b/source3/wscript_build
index 476aa9072bb..5d04fcb41d1 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1136,7 +1136,6 @@ bld.SAMBA3_BINARY('smbspool',
source='client/smbspool.c',
deps='''
talloc
- popt_samba3
smbconf
libsmb
samba3core
@@ -1380,7 +1379,6 @@ bld.SAMBA3_BINARY('tevent_glib_glue_test',
deps='''
talloc
libsmb
- popt_samba3
tevent-glib-glue''',
enabled=bld.CONFIG_SET('WITH_TEVENT_GLIB_GLUE'),
for_selftest=True)
--
Samba Shared Repository
More information about the samba-cvs
mailing list