[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  097be4b s3: Make proper use of sid_check_is_in_xx routines
       via  26b2a13 s3: Fix a typo
       via  5915d4a s3: Remove some duplicate prototypes
      from  c1e3c8b socket_wrapper: fill in sa.sa_len if the system supports it

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 097be4b10175c3b2f039f7406aac1d21bb7824b3
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 5 15:48:44 2010 +0100

    s3: Make proper use of sid_check_is_in_xx routines
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Fri Nov  5 15:35:59 UTC 2010 on sn-devel-104

commit 26b2a132ffcd8485f06b349901796fb0367b62c7
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 5 15:44:55 2010 +0100

    s3: Fix a typo

commit 5915d4a0b63882573a406a543f9cd5b72de061ff
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 5 15:38:28 2010 +0100

    s3: Remove some duplicate prototypes

-----------------------------------------------------------------------

Summary of changes:
 source3/auth/server_info.c        |    6 +++---
 source3/utils/net_proto.h         |   15 ---------------
 source3/winbindd/winbindd_proto.h |   16 ----------------
 3 files changed, 3 insertions(+), 34 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c
index c08c284..d288a0c 100644
--- a/source3/auth/server_info.c
+++ b/source3/auth/server_info.c
@@ -240,7 +240,7 @@ static NTSTATUS append_netr_SidAttr(TALLOC_CTX *mem_ctx,
 	return NT_STATUS_OK;
 }
 
-/* Fils the samr_RidWithAttributeArray with the provided sids.
+/* Fills the samr_RidWithAttributeArray with the provided sids.
  * If it happens that we have additional groups that do not belong
  * to the domain, add their sids as extra sids */
 static NTSTATUS group_sids_to_info3(struct netr_SamInfo3 *info3,
@@ -333,7 +333,7 @@ NTSTATUS samu_to_SamInfo3(TALLOC_CTX *mem_ctx,
 
 	/* check if this is a "Unix Users" domain user,
 	 * we need to handle it in a special way if that's the case */
-	if (dom_sid_compare_domain(user_sid, &global_sid_Unix_Users) == 0) {
+	if (sid_check_is_in_unix_users(user_sid)) {
 		/* in info3 you can only set rids for the user and the
 		 * primary group, and the domain sid must be that of
 		 * the sam domain.
@@ -359,7 +359,7 @@ NTSTATUS samu_to_SamInfo3(TALLOC_CTX *mem_ctx,
 
 	/* check if this is a "Unix Groups" domain group,
 	 * if so we need special handling */
-	if (dom_sid_compare_domain(group_sid, &global_sid_Unix_Groups) == 0) {
+	if (sid_check_is_in_unix_groups(group_sid)) {
 		/* in info3 you can only set rids for the user and the
 		 * primary group, and the domain sid must be that of
 		 * the sam domain.
diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h
index 8422d28..9e9e82f 100644
--- a/source3/utils/net_proto.h
+++ b/source3/utils/net_proto.h
@@ -24,21 +24,6 @@
 #define _NET_PROTO_H_
 
 
-/* The following definitions come from auth/token_util.c  */
-
-bool nt_token_check_sid ( const struct dom_sid *sid, const struct security_token *token );
-bool nt_token_check_domain_rid( struct security_token *token, uint32 rid );
-struct security_token *get_root_nt_token( void );
-NTSTATUS add_aliases(const struct dom_sid *domain_sid,
-		     struct security_token *token);
-struct security_token *create_local_nt_token(TALLOC_CTX *mem_ctx,
-					    const struct dom_sid *user_sid,
-					    bool is_guest,
-					    int num_groupsids,
-					    const struct dom_sid *groupsids);
-void debug_unix_user_token(int dbg_class, int dbg_lev, uid_t uid, gid_t gid,
-			   int n_groups, gid_t *groups);
-
 /* The following definitions come from utils/net.c  */
 
 enum netr_SchannelType get_sec_channel_type(const char *param);
diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index 3a7a298..ecdbdfe 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -23,22 +23,6 @@
 #ifndef _WINBINDD_PROTO_H_
 #define _WINBINDD_PROTO_H_
 
-
-/* The following definitions come from auth/token_util.c  */
-
-bool nt_token_check_sid ( const struct dom_sid *sid, const struct security_token *token );
-bool nt_token_check_domain_rid( struct security_token *token, uint32 rid );
-struct security_token *get_root_nt_token( void );
-NTSTATUS add_aliases(const struct dom_sid *domain_sid,
-		     struct security_token *token);
-struct security_token *create_local_nt_token(TALLOC_CTX *mem_ctx,
-					    const struct dom_sid *user_sid,
-					    bool is_guest,
-					    int num_groupsids,
-					    const struct dom_sid *groupsids);
-void debug_unix_user_token(int dbg_class, int dbg_lev, uid_t uid, gid_t gid,
-			   int n_groups, gid_t *groups);
-
 /* The following definitions come from winbindd/winbindd.c  */
 struct messaging_context *winbind_messaging_context(void);
 void request_error(struct winbindd_cli_state *state);


-- 
Samba Shared Repository