summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1997-10-22 11:31:37 +0000
committerLuke Leighton <lkcl@samba.org>1997-10-22 11:31:37 +0000
commit2e8cedba6480d0c1f89d3490888cadac769d09ca (patch)
tree2e974c68a0b9ba107332173766aa9d400aa15abe /source3/include
parentf20e6f6b261c3976b412845000b3f170f8ad6a9f (diff)
downloadsamba-2e8cedba6480d0c1f89d3490888cadac769d09ca.tar.gz
samba-2e8cedba6480d0c1f89d3490888cadac769d09ca.tar.bz2
samba-2e8cedba6480d0c1f89d3490888cadac769d09ca.zip
loadparm.c :
added "domain other sids" parameter pipenetlog.c : using "domain other sids" parameter in SAM Logon response. using new name_to_rid() function for r_uid and r_gid. pipentlsa.c : minor mods to do with new name_to_rid() function. pipesrvsvc.c : in the "net share enum" response, allocate some more space for the buffer. there can be only 32 share entries in the response anyway. this needs to be dealt with. pipeutil.c : modified name_to_rid() function to use new parameters "domain admin users" and "domain guest users", but will otherwise do unix uid + 1000. moved make_dom_gids() here. proto.h: the usual. smb.h smbparse.c : renamed sid_no to sid_rev_num in DOM_SID, and gid to r_gid in DOM_GID. util.c : moved make_dom_gids() from here. created char *unistrn2(uint16* uni_buffer, int max_len) (This used to be commit ec60e48d7982240b7755d246b2f1e8989467f66f)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/proto.h9
-rw-r--r--source3/include/smb.h8
2 files changed, 10 insertions, 7 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 149009685e..6bab787be9 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -186,7 +186,8 @@ char *lp_socket_address(void);
char *lp_nis_home_map_name(void);
char *lp_announce_version(void);
char *lp_netbios_aliases(void);
-char *lp_domainsid(void);
+char *lp_domain_sid(void);
+char *lp_domain_other_sids(void);
char *lp_domain_groups(void);
char *lp_domain_admin_users(void);
char *lp_domain_guest_users(void);
@@ -696,9 +697,11 @@ BOOL api_srvsvcTNP(int cnum,int uid, char *param,char *data,
void initrpcreply(char *inbuf, char *q);
void endrpcreply(char *inbuf, char *q, int datalen, int rtnval, int *rlen);
-uint32 name_to_rid(char *user_name);
+BOOL name_to_rid(char *user_name, uint32 *u_rid, uint32 *g_rid);
char *dom_sid_to_string(DOM_SID *sid);
void make_dom_sid(DOM_SID *sid, char *domsid);
+int make_dom_sids(char *sids_str, DOM_SID *sids, int max_sids);
+int make_dom_gids(char *gids_str, DOM_GID *gids);
void create_rpc_reply(RPC_HDR *hdr, uint32 call_id, int data_len);
int make_rpc_reply(char *inbuf, char *q, int data_len);
void make_uni_hdr(UNIHDR *hdr, int max_len, int len, uint16 terminate);
@@ -1139,6 +1142,7 @@ BOOL is_myname(char *s);
void set_remote_arch(enum remote_arch_types type);
enum remote_arch_types get_remote_arch();
char *skip_unicode_string(char *buf,int n);
+char *unistrn2(uint16 *buf, int len);
char *unistr2(uint16 *buf);
char *unistr(char *buf);
int unistrncpy(char *dst, char *src, int len);
@@ -1150,4 +1154,3 @@ char *align2(char *q, char *base);
char *align_offset(char *q, char *base, int align_offset_len);
void dump_data(int level,char *buf1,int len);
char *tab_depth(int depth);
-int make_domain_gids(char *gids_str, DOM_GID *gids);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index c982e3e78d..913f5607b7 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -341,15 +341,15 @@ typedef struct nttime_info
} NTTIME;
-#define MAXSUBAUTHS 10 /* max sub authorities in a SID */
+#define MAXSUBAUTHS 15 /* max sub authorities in a SID */
/* DOM_SID - security id */
typedef struct sid_info
{
- uint8 sid_no; /* SID revision number */
+ uint8 sid_rev_num; /* SID revision number */
uint8 num_auths; /* number of sub-authorities */
uint8 id_auth[6]; /* Identifier Authority */
- uint16 sub_auths[MAXSUBAUTHS]; /* pointer to sub-authorities. */
+ uint16 sub_auths[MAXSUBAUTHS]; /* pointer to sub-authorities. */
} DOM_SID;
@@ -517,7 +517,7 @@ typedef struct sam_info
/* DOM_GID - group id + user attributes */
typedef struct gid_info
{
- uint32 gid; /* group id */
+ uint32 g_rid; /* a group RID */
uint32 attr;
} DOM_GID;