The branch, master has been updated
via fd1b6bd... s3: Fix some nonempty blank lines
via 86a73e6... s3: Use sid_check_is_domain instead of a direct sid_equal
via 48251c3... s3: Use sid_check_is_in_our_domain instead of a direct
sid_peek_check_rid
via 3ea64e0... s3: Replace most calls to sid_append_rid() by
sid_compose()
via 50b7a32... s3: Remove unused samr_make_sam_obj_sd
via 0815730... s3: Remove the typedef for "auth_serversupplied_info"
via 9bb4766... s3: Remove the typedef for "auth_usersupplied_info"
from 6f0e7b9... s3: Trim libnss_wins.so
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit fd1b6bdef9b68b9fc8c7915350c48eeaba9d7c04
Author: Volker Lendecke <[email protected]>
Date: Sat Jan 9 20:26:46 2010 +0100
s3: Fix some nonempty blank lines
commit 86a73e6eba35973b0de63e3e048da99c7472582a
Author: Volker Lendecke <[email protected]>
Date: Sun Jan 10 17:58:12 2010 +0100
s3: Use sid_check_is_domain instead of a direct sid_equal
commit 48251c3370ed24aecd677d923d109ed7eda07388
Author: Volker Lendecke <[email protected]>
Date: Sun Jan 10 17:57:00 2010 +0100
s3: Use sid_check_is_in_our_domain instead of a direct sid_peek_check_rid
commit 3ea64e0ad86c35e5f0018ac60571e7a31a968543
Author: Volker Lendecke <[email protected]>
Date: Sun Jan 10 17:39:27 2010 +0100
s3: Replace most calls to sid_append_rid() by sid_compose()
commit 50b7a3233f1edc184acb0b65870fff1db1226ef4
Author: Volker Lendecke <[email protected]>
Date: Sun Jan 10 17:30:54 2010 +0100
s3: Remove unused samr_make_sam_obj_sd
commit 081573091bc3f2b4f85164db51878e570377d4e8
Author: Volker Lendecke <[email protected]>
Date: Sun Jan 10 14:24:22 2010 +0100
s3: Remove the typedef for "auth_serversupplied_info"
commit 9bb4766bbaaec58989f1f544b7e2367691a09c53
Author: Volker Lendecke <[email protected]>
Date: Sun Jan 10 14:16:04 2010 +0100
s3: Remove the typedef for "auth_usersupplied_info"
-----------------------------------------------------------------------
Summary of changes:
source3/auth/auth_builtin.c | 12 +++---
source3/auth/auth_compat.c | 10 +++--
source3/auth/auth_domain.c | 12 +++---
source3/auth/auth_netlogond.c | 6 +-
source3/auth/auth_ntlmssp.c | 2 +-
source3/auth/auth_sam.c | 14 +++---
source3/auth/auth_script.c | 4 +-
source3/auth/auth_server.c | 4 +-
source3/auth/auth_unix.c | 4 +-
source3/auth/auth_util.c | 64 +++++++++++++--------------
source3/auth/auth_wbc.c | 4 +-
source3/auth/auth_winbind.c | 4 +-
source3/groupdb/mapping.c | 3 +-
source3/include/auth.h | 10 ++--
source3/include/proto.h | 35 +++++++-------
source3/lib/util_seaccess.c | 40 ----------------
source3/libnet/libnet_samsync_passdb.c | 15 ++----
source3/libsmb/samlogon_cache.c | 6 +--
source3/passdb/lookup_sid.c | 21 +++------
source3/passdb/passdb.c | 3 +-
source3/passdb/pdb_compat.c | 10 ++---
source3/passdb/pdb_get_set.c | 7 +--
source3/passdb/pdb_interface.c | 3 +-
source3/passdb/util_unixsids.c | 26 ++++++-----
source3/passdb/util_wellknown.c | 4 +-
source3/printing/nt_printing.c | 4 +-
source3/rpc_server/srv_lsa_nt.c | 3 +-
source3/rpc_server/srv_netlog_nt.c | 4 +-
source3/rpc_server/srv_samr_nt.c | 17 ++++---
source3/smbd/lanman.c | 2 +-
source3/smbd/password.c | 2 +-
source3/smbd/sesssetup.c | 12 +++---
source3/utils/net_groupmap.c | 9 +---
source3/utils/net_rpc.c | 7 +--
source3/utils/ntlm_auth.c | 72 +++++++++++++++---------------
source3/utils/pdbedit.c | 3 +-
source3/winbindd/idmap_hash/idmap_hash.c | 3 +-
source3/winbindd/idmap_tdb.c | 3 +-
source3/winbindd/winbindd_ads.c | 3 +-
source3/winbindd/winbindd_cache.c | 3 +-
source3/winbindd/winbindd_cred_cache.c | 6 +-
source3/winbindd/winbindd_creds.c | 6 +-
source3/winbindd/winbindd_pam.c | 4 +-
source3/winbindd/winbindd_rpc.c | 5 +-
44 files changed, 213 insertions(+), 278 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/auth/auth_builtin.c b/source3/auth/auth_builtin.c
index 3741f29..f8f048a 100644
--- a/source3/auth/auth_builtin.c
+++ b/source3/auth/auth_builtin.c
@@ -34,8 +34,8 @@
static NTSTATUS check_guest_security(const struct auth_context *auth_context,
void *my_private_data,
TALLOC_CTX *mem_ctx,
- const auth_usersupplied_info *user_info,
- auth_serversupplied_info **server_info)
+ const struct auth_usersupplied_info
*user_info,
+ struct auth_serversupplied_info
**server_info)
{
/* mark this as 'not for me' */
NTSTATUS nt_status = NT_STATUS_NOT_IMPLEMENTED;
@@ -77,8 +77,8 @@ static NTSTATUS auth_init_guest(struct auth_context
*auth_context, const char *o
static NTSTATUS check_name_to_ntstatus_security(const struct auth_context
*auth_context,
void *my_private_data,
TALLOC_CTX *mem_ctx,
- const auth_usersupplied_info
*user_info,
- auth_serversupplied_info
**server_info)
+ const struct
auth_usersupplied_info *user_info,
+ struct auth_serversupplied_info
**server_info)
{
NTSTATUS nt_status;
fstring user;
@@ -130,8 +130,8 @@ static NTSTATUS auth_init_name_to_ntstatus(struct
auth_context *auth_context, co
static NTSTATUS check_fixed_challenge_security(const struct auth_context
*auth_context,
void *my_private_data,
TALLOC_CTX *mem_ctx,
- const auth_usersupplied_info
*user_info,
- auth_serversupplied_info
**server_info)
+ const struct
auth_usersupplied_info *user_info,
+ struct auth_serversupplied_info
**server_info)
{
return NT_STATUS_NOT_IMPLEMENTED;
}
diff --git a/source3/auth/auth_compat.c b/source3/auth/auth_compat.c
index 77a9948..e90036f 100644
--- a/source3/auth/auth_compat.c
+++ b/source3/auth/auth_compat.c
@@ -35,10 +35,12 @@ SMB hash
return True if the password is correct, False otherwise
****************************************************************************/
-NTSTATUS check_plaintext_password(const char *smb_name, DATA_BLOB
plaintext_password, auth_serversupplied_info **server_info)
+NTSTATUS check_plaintext_password(const char *smb_name,
+ DATA_BLOB plaintext_password,
+ struct auth_serversupplied_info **server_info)
{
struct auth_context *plaintext_auth_context = NULL;
- auth_usersupplied_info *user_info = NULL;
+ struct auth_usersupplied_info *user_info = NULL;
uint8_t chal[8];
NTSTATUS nt_status;
if (!NT_STATUS_IS_OK(nt_status =
make_auth_context_subsystem(&plaintext_auth_context))) {
@@ -72,9 +74,9 @@ static NTSTATUS pass_check_smb(struct auth_context *actx,
{
NTSTATUS nt_status;
- auth_serversupplied_info *server_info = NULL;
+ struct auth_serversupplied_info *server_info = NULL;
if (encrypted) {
- auth_usersupplied_info *user_info = NULL;
+ struct auth_usersupplied_info *user_info = NULL;
if (actx == NULL) {
return NT_STATUS_INTERNAL_ERROR;
}
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index c527360..a07aa61 100644
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -251,10 +251,10 @@ machine %s. Error was : %s.\n", dc_name,
cli_errstr(*cli)));
************************************************************************/
static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
- const auth_usersupplied_info
*user_info,
+ const struct auth_usersupplied_info
*user_info,
const char *domain,
uchar chal[8],
- auth_serversupplied_info **server_info,
+ struct auth_serversupplied_info
**server_info,
const char *dc_name,
struct sockaddr_storage *dc_ss)
@@ -372,8 +372,8 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
static NTSTATUS check_ntdomain_security(const struct auth_context
*auth_context,
void *my_private_data,
TALLOC_CTX *mem_ctx,
- const auth_usersupplied_info
*user_info,
- auth_serversupplied_info **server_info)
+ const struct auth_usersupplied_info
*user_info,
+ struct auth_serversupplied_info
**server_info)
{
NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE;
const char *domain = lp_workgroup();
@@ -441,8 +441,8 @@ static NTSTATUS auth_init_ntdomain(struct auth_context
*auth_context, const char
static NTSTATUS check_trustdomain_security(const struct auth_context
*auth_context,
void *my_private_data,
TALLOC_CTX *mem_ctx,
- const auth_usersupplied_info
*user_info,
- auth_serversupplied_info
**server_info)
+ const struct auth_usersupplied_info
*user_info,
+ struct auth_serversupplied_info
**server_info)
{
NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE;
unsigned char trust_md4_password[16];
diff --git a/source3/auth/auth_netlogond.c b/source3/auth/auth_netlogond.c
index ebfed83..bfd1228 100644
--- a/source3/auth/auth_netlogond.c
+++ b/source3/auth/auth_netlogond.c
@@ -27,7 +27,7 @@ static NTSTATUS netlogond_validate(TALLOC_CTX *mem_ctx,
const struct auth_context *auth_context,
const char *ncalrpc_sockname,
uint8_t schannel_key[16],
- const auth_usersupplied_info *user_info,
+ const struct auth_usersupplied_info
*user_info,
struct netr_SamInfo3 **pinfo3,
NTSTATUS *schannel_bind_result)
{
@@ -153,8 +153,8 @@ static char *mymachinepw(TALLOC_CTX *mem_ctx)
static NTSTATUS check_netlogond_security(const struct auth_context
*auth_context,
void *my_private_data,
TALLOC_CTX *mem_ctx,
- const auth_usersupplied_info
*user_info,
- auth_serversupplied_info **server_info)
+ const struct auth_usersupplied_info
*user_info,
+ struct auth_serversupplied_info
**server_info)
{
TALLOC_CTX *frame = talloc_stackframe();
struct netr_SamInfo3 *info3 = NULL;
diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c
index 4243a24..88f0e69 100644
--- a/source3/auth/auth_ntlmssp.c
+++ b/source3/auth/auth_ntlmssp.c
@@ -85,7 +85,7 @@ static NTSTATUS auth_ntlmssp_check_password(struct
ntlmssp_state *ntlmssp_state,
{
AUTH_NTLMSSP_STATE *auth_ntlmssp_state =
(AUTH_NTLMSSP_STATE *)ntlmssp_state->auth_context;
- auth_usersupplied_info *user_info = NULL;
+ struct auth_usersupplied_info *user_info = NULL;
NTSTATUS nt_status;
bool username_was_mapped;
diff --git a/source3/auth/auth_sam.c b/source3/auth/auth_sam.c
index ef0cd97..834ca97 100644
--- a/source3/auth/auth_sam.c
+++ b/source3/auth/auth_sam.c
@@ -37,7 +37,7 @@ static NTSTATUS sam_password_ok(const struct auth_context
*auth_context,
uint32_t acct_ctrl,
const uint8_t *lm_pw,
const uint8_t *nt_pw,
- const auth_usersupplied_info *user_info,
+ const struct auth_usersupplied_info *user_info,
DATA_BLOB *user_sess_key,
DATA_BLOB *lm_sess_key)
{
@@ -168,7 +168,7 @@ static bool logon_hours_ok(struct samu *sampass)
static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
struct samu *sampass,
- const auth_usersupplied_info *user_info)
+ const struct auth_usersupplied_info *user_info)
{
uint32 acct_ctrl = pdb_get_acct_ctrl(sampass);
char *workstation_list;
@@ -290,7 +290,7 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
static bool need_to_increment_bad_pw_count(
const struct auth_context *auth_context,
struct samu* sampass,
- const auth_usersupplied_info *user_info)
+ const struct auth_usersupplied_info *user_info)
{
uint8_t i;
const uint8_t *pwhistory;
@@ -359,8 +359,8 @@ return an NT_STATUS constant.
static NTSTATUS check_sam_security(const struct auth_context *auth_context,
void *my_private_data,
TALLOC_CTX *mem_ctx,
- const auth_usersupplied_info *user_info,
- auth_serversupplied_info **server_info)
+ const struct auth_usersupplied_info
*user_info,
+ struct auth_serversupplied_info
**server_info)
{
struct samu *sampass=NULL;
bool ret;
@@ -532,8 +532,8 @@ Check SAM security (above) but with a few extra checks.
static NTSTATUS check_samstrict_security(const struct auth_context
*auth_context,
void *my_private_data,
TALLOC_CTX *mem_ctx,
- const auth_usersupplied_info
*user_info,
- auth_serversupplied_info **server_info)
+ const struct auth_usersupplied_info
*user_info,
+ struct auth_serversupplied_info
**server_info)
{
bool is_local_name, is_my_domain;
diff --git a/source3/auth/auth_script.c b/source3/auth/auth_script.c
index 6cbace7..be1ae81 100644
--- a/source3/auth/auth_script.c
+++ b/source3/auth/auth_script.c
@@ -40,8 +40,8 @@
static NTSTATUS script_check_user_credentials(const struct auth_context
*auth_context,
void *my_private_data,
TALLOC_CTX *mem_ctx,
- const auth_usersupplied_info
*user_info,
- auth_serversupplied_info **server_info)
+ const struct auth_usersupplied_info
*user_info,
+ struct auth_serversupplied_info
**server_info)
{
const char *script = lp_parm_const_string( GLOBAL_SECTION_SNUM,
"auth_script", "script", NULL);
char *secret_str;
diff --git a/source3/auth/auth_server.c b/source3/auth/auth_server.c
index 287b50b..ec92787 100644
--- a/source3/auth/auth_server.c
+++ b/source3/auth/auth_server.c
@@ -270,8 +270,8 @@ static DATA_BLOB auth_get_challenge_server(const struct
auth_context *auth_conte
static NTSTATUS check_smbserver_security(const struct auth_context
*auth_context,
void *my_private_data,
TALLOC_CTX *mem_ctx,
- const auth_usersupplied_info
*user_info,
- auth_serversupplied_info **server_info)
+ const struct auth_usersupplied_info
*user_info,
+ struct auth_serversupplied_info
**server_info)
{
struct server_security_state *state = talloc_get_type_abort(
my_private_data, struct server_security_state);
diff --git a/source3/auth/auth_unix.c b/source3/auth/auth_unix.c
index 58c7652..3e2df9a 100644
--- a/source3/auth/auth_unix.c
+++ b/source3/auth/auth_unix.c
@@ -85,8 +85,8 @@ static bool update_smbpassword_file(const char *user, const
char *password)
static NTSTATUS check_unix_security(const struct auth_context *auth_context,
void *my_private_data,
TALLOC_CTX *mem_ctx,
- const auth_usersupplied_info *user_info,
- auth_serversupplied_info **server_info)
+ const struct auth_usersupplied_info *user_info,
+ struct auth_serversupplied_info **server_info)
{
NTSTATUS nt_status;
struct passwd *pass = NULL;
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 8167a80..de552cf 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -33,7 +33,7 @@
auth_serversupplied_info struct.
****************************************************************************/
-static void sort_sid_array_for_smbd(auth_serversupplied_info *result,
+static void sort_sid_array_for_smbd(struct auth_serversupplied_info *result,
const DOM_SID *pgroup_sid)
{
unsigned int i;
@@ -107,7 +107,7 @@ static int _smb_create_user(const char *domain, const char
*unix_username, const
Create an auth_usersupplied_data structure
****************************************************************************/
-static NTSTATUS make_user_info(auth_usersupplied_info **user_info,
+static NTSTATUS make_user_info(struct auth_usersupplied_info **user_info,
const char *smb_name,
const char *internal_username,
const char *client_domain,
@@ -121,7 +121,7 @@ static NTSTATUS make_user_info(auth_usersupplied_info
**user_info,
DEBUG(5,("attempting to make a user_info for %s (%s)\n",
internal_username, smb_name));
- *user_info = SMB_MALLOC_P(auth_usersupplied_info);
+ *user_info = SMB_MALLOC_P(struct auth_usersupplied_info);
if (*user_info == NULL) {
DEBUG(0,("malloc failed for user_info (size %lu)\n", (unsigned
long)sizeof(*user_info)));
return NT_STATUS_NO_MEMORY;
@@ -188,7 +188,7 @@ static NTSTATUS make_user_info(auth_usersupplied_info
**user_info,
Create an auth_usersupplied_data structure after appropriate mapping.
****************************************************************************/
-NTSTATUS make_user_info_map(auth_usersupplied_info **user_info,
+NTSTATUS make_user_info_map(struct auth_usersupplied_info **user_info,
const char *smb_name,
const char *client_domain,
const char *wksta_name,
@@ -252,7 +252,7 @@ NTSTATUS make_user_info_map(auth_usersupplied_info
**user_info,
Decrypt and encrypt the passwords.
****************************************************************************/
-bool make_user_info_netlogon_network(auth_usersupplied_info **user_info,
+bool make_user_info_netlogon_network(struct auth_usersupplied_info **user_info,
const char *smb_name,
const char *client_domain,
const char *wksta_name,
@@ -290,7 +290,7 @@ bool make_user_info_netlogon_network(auth_usersupplied_info
**user_info,
Decrypt and encrypt the passwords.
****************************************************************************/
-bool make_user_info_netlogon_interactive(auth_usersupplied_info **user_info,
+bool make_user_info_netlogon_interactive(struct auth_usersupplied_info
**user_info,
const char *smb_name,
const char *client_domain,
const char *wksta_name,
@@ -402,7 +402,7 @@ bool
make_user_info_netlogon_interactive(auth_usersupplied_info **user_info,
Create an auth_usersupplied_data structure
****************************************************************************/
-bool make_user_info_for_reply(auth_usersupplied_info **user_info,
+bool make_user_info_for_reply(struct auth_usersupplied_info **user_info,
const char *smb_name,
const char *client_domain,
const uint8 chal[8],
@@ -460,7 +460,7 @@ bool make_user_info_for_reply(auth_usersupplied_info
**user_info,
Create an auth_usersupplied_data structure
****************************************************************************/
-NTSTATUS make_user_info_for_reply_enc(auth_usersupplied_info **user_info,
+NTSTATUS make_user_info_for_reply_enc(struct auth_usersupplied_info
**user_info,
const char *smb_name,
const char *client_domain,
DATA_BLOB lm_resp, DATA_BLOB nt_resp)
@@ -478,7 +478,7 @@ NTSTATUS
make_user_info_for_reply_enc(auth_usersupplied_info **user_info,
Create a guest user_info blob, for anonymous authenticaion.
****************************************************************************/
-bool make_user_info_guest(auth_usersupplied_info **user_info)
+bool make_user_info_guest(struct auth_usersupplied_info **user_info)
{
NTSTATUS nt_status;
@@ -494,7 +494,7 @@ bool make_user_info_guest(auth_usersupplied_info
**user_info)
return NT_STATUS_IS_OK(nt_status) ? True : False;
}
-static int server_info_dtor(auth_serversupplied_info *server_info)
+static int server_info_dtor(struct auth_serversupplied_info *server_info)
{
TALLOC_FREE(server_info->sam_account);
ZERO_STRUCTP(server_info);
@@ -505,11 +505,11 @@ static int server_info_dtor(auth_serversupplied_info
*server_info)
Make a server_info struct. Free with TALLOC_FREE().
***************************************************************************/
-static auth_serversupplied_info *make_server_info(TALLOC_CTX *mem_ctx)
+static struct auth_serversupplied_info *make_server_info(TALLOC_CTX *mem_ctx)
{
struct auth_serversupplied_info *result;
- result = TALLOC_ZERO_P(mem_ctx, auth_serversupplied_info);
+ result = TALLOC_ZERO_P(mem_ctx, struct auth_serversupplied_info);
if (result == NULL) {
DEBUG(0, ("talloc failed\n"));
return NULL;
@@ -562,12 +562,12 @@ static bool is_our_machine_account(const char *username)
Make (and fill) a user_info struct from a struct samu
***************************************************************************/
-NTSTATUS make_server_info_sam(auth_serversupplied_info **server_info,
+NTSTATUS make_server_info_sam(struct auth_serversupplied_info **server_info,
struct samu *sampass)
{
struct passwd *pwd;
gid_t *gids;
- auth_serversupplied_info *result;
+ struct auth_serversupplied_info *result;
const char *username = pdb_get_username(sampass);
NTSTATUS status;
@@ -701,7 +701,7 @@ static NTSTATUS log_nt_token(NT_USER_TOKEN *token)
* server_info->sids (the info3/sam groups). Find the unix gids.
*/
-NTSTATUS create_local_token(auth_serversupplied_info *server_info)
+NTSTATUS create_local_token(struct auth_serversupplied_info *server_info)
{
NTSTATUS status;
size_t i;
@@ -1140,7 +1140,7 @@ bool user_in_group(const char *username, const char
*groupname)
to a struct samu
***************************************************************************/
-NTSTATUS make_server_info_pw(auth_serversupplied_info **server_info,
+NTSTATUS make_server_info_pw(struct auth_serversupplied_info **server_info,
char *unix_username,
struct passwd *pwd)
{
@@ -1151,7 +1151,7 @@ NTSTATUS make_server_info_pw(auth_serversupplied_info
**server_info,
TALLOC_CTX *mem_ctx = NULL;
DOM_SID u_sid;
enum lsa_SidType type;
- auth_serversupplied_info *result;
+ struct auth_serversupplied_info *result;
if ( !(sampass = samu_new( NULL )) ) {
return NT_STATUS_NO_MEMORY;
@@ -1261,7 +1261,7 @@ NTSTATUS make_server_info_pw(auth_serversupplied_info
**server_info,
the guest gid, then create one.
***************************************************************************/
-static NTSTATUS make_new_server_info_guest(auth_serversupplied_info
**server_info)
+static NTSTATUS make_new_server_info_guest(struct auth_serversupplied_info
**server_info)
{
NTSTATUS status;
struct samu *sampass = NULL;
@@ -1274,8 +1274,7 @@ static NTSTATUS
make_new_server_info_guest(auth_serversupplied_info **server_inf
return NT_STATUS_NO_MEMORY;
}
- sid_copy(&guest_sid, get_global_sam_sid());
- sid_append_rid(&guest_sid, DOMAIN_USER_RID_GUEST);
+ sid_compose(&guest_sid, get_global_sam_sid(), DOMAIN_USER_RID_GUEST);
become_root();
ret = pdb_getsampwsid(sampass, &guest_sid);
@@ -1355,9 +1354,9 @@ NTSTATUS make_serverinfo_from_username(TALLOC_CTX
*mem_ctx,
struct auth_serversupplied_info *copy_serverinfo(TALLOC_CTX *mem_ctx,
- const auth_serversupplied_info
*src)
+ const struct
auth_serversupplied_info *src)
{
- auth_serversupplied_info *dst;
+ struct auth_serversupplied_info *dst;
dst = make_server_info(mem_ctx);
if (dst == NULL) {
@@ -1433,7 +1432,7 @@ bool server_info_set_session_key(struct
auth_serversupplied_info *info,
return (info->user_session_key.data != NULL);
}
-static auth_serversupplied_info *guest_info = NULL;
+static struct auth_serversupplied_info *guest_info = NULL;
bool init_guest_info(void)
{
@@ -1444,7 +1443,7 @@ bool init_guest_info(void)
}
NTSTATUS make_server_info_guest(TALLOC_CTX *mem_ctx,
- auth_serversupplied_info **server_info)
+ struct auth_serversupplied_info **server_info)
{
*server_info = copy_serverinfo(mem_ctx, guest_info);
return (*server_info != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY;
@@ -1620,7 +1619,7 @@ struct passwd *smb_getpwnam( TALLOC_CTX *mem_ctx, char
*domuser,
NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
const char *sent_nt_username,
const char *domain,
- auth_serversupplied_info **server_info,
+ struct auth_serversupplied_info **server_info,
struct netr_SamInfo3 *info3)
{
char zeros[16];
@@ -1637,7 +1636,7 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
uid_t uid = (uid_t)-1;
gid_t gid = (gid_t)-1;
- auth_serversupplied_info *result;
+ struct auth_serversupplied_info *result;
/*
Here is where we should check the list of
@@ -1645,13 +1644,12 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
matches.
*/
- sid_copy(&user_sid, info3->base.domain_sid);
- if (!sid_append_rid(&user_sid, info3->base.rid)) {
+ if (!sid_compose(&user_sid, info3->base.domain_sid, info3->base.rid)) {
return NT_STATUS_INVALID_PARAMETER;
}
- sid_copy(&group_sid, info3->base.domain_sid);
- if (!sid_append_rid(&group_sid, info3->base.primary_gid)) {
+ if (!sid_compose(&group_sid, info3->base.domain_sid,
+ info3->base.primary_gid)) {
return NT_STATUS_INVALID_PARAMETER;
}
@@ -1873,7 +1871,7 @@ NTSTATUS make_server_info_wbcAuthUserInfo(TALLOC_CTX
*mem_ctx,
const char *sent_nt_username,
const char *domain,
const struct wbcAuthUserInfo *info,
- auth_serversupplied_info
**server_info)
+ struct auth_serversupplied_info
**server_info)
{
char zeros[16];
@@ -1890,7 +1888,7 @@ NTSTATUS make_server_info_wbcAuthUserInfo(TALLOC_CTX
*mem_ctx,
uid_t uid = (uid_t)-1;
gid_t gid = (gid_t)-1;
- auth_serversupplied_info *result;
+ struct auth_serversupplied_info *result;
result = make_server_info(NULL);
if (result == NULL) {
@@ -2114,7 +2112,7 @@ NTSTATUS make_server_info_wbcAuthUserInfo(TALLOC_CTX
*mem_ctx,
Free a user_info struct
***************************************************************************/
-void free_user_info(auth_usersupplied_info **user_info)
+void free_user_info(struct auth_usersupplied_info **user_info)
--
Samba Shared Repository
