summaryrefslogtreecommitdiff
path: root/source3/rpc_server
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-12-31 13:46:26 +0000
committerAndrew Tridgell <tridge@samba.org>2001-12-31 13:46:26 +0000
commiteb4e10115310b6ed23b92abac2e79454c80930b1 (patch)
tree21872afdfeb5192627856880c3fbc85432913444 /source3/rpc_server
parentaf7bd393dabc51cedafc1ea24cc9f7101c81f4bf (diff)
downloadsamba-eb4e10115310b6ed23b92abac2e79454c80930b1.tar.gz
samba-eb4e10115310b6ed23b92abac2e79454c80930b1.tar.bz2
samba-eb4e10115310b6ed23b92abac2e79454c80930b1.zip
- portablitity fixes for cc -64 on irix
- fixed gid* bug in rpc_server (This used to be commit 48aa90c48c5f0e3054c4acdc49668e222e7c0d36)
Diffstat (limited to 'source3/rpc_server')
-rw-r--r--source3/rpc_server/srv_lsa_nt.c1
-rw-r--r--source3/rpc_server/srv_srvsvc_nt.c2
-rw-r--r--source3/rpc_server/srv_util.c6
3 files changed, 4 insertions, 5 deletions
diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index 432f20a40c..9916b99c8a 100644
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -1116,7 +1116,6 @@ NTSTATUS _lsa_query_secobj(pipes_struct *p, LSA_Q_QUERY_SEC_OBJ *q_u, LSA_R_QUER
break;
default:
return NT_STATUS_INVALID_LEVEL;
- break;
}
r_u->ptr=1;
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index 06cbbaa2dc..57757e28b5 100644
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -1827,7 +1827,7 @@ NTSTATUS _srv_net_disk_enum(pipes_struct *p, SRV_Q_NET_DISK_ENUM *q_u, SRV_R_NET
r_u->disk_enum_ctr.unknown = 0;
- r_u->disk_enum_ctr.disk_info_ptr = (uint32) r_u->disk_enum_ctr.disk_info;
+ r_u->disk_enum_ctr.disk_info_ptr = r_u->disk_enum_ctr.disk_info? 1 : 0;
/*allow one DISK_INFO for null terminator*/
diff --git a/source3/rpc_server/srv_util.c b/source3/rpc_server/srv_util.c
index 5c781c20ae..14caf89e2f 100644
--- a/source3/rpc_server/srv_util.c
+++ b/source3/rpc_server/srv_util.c
@@ -86,7 +86,7 @@ NTSTATUS get_alias_user_groups(TALLOC_CTX *ctx, DOM_SID *sid, int *numgroups, ui
struct sys_grent *glist;
struct sys_grent *grp;
int i, num, cur_rid=0;
- gid_t *gid;
+ gid_t gid;
GROUP_MAP map;
DOM_SID tmp_sid;
fstring user_name;
@@ -204,9 +204,9 @@ NTSTATUS get_alias_user_groups(TALLOC_CTX *ctx, DOM_SID *sid, int *numgroups, ui
goto done;
}
- DEBUG(10,("get_alias_user_groups: looking for gid %d of user %s\n", (int)*gid, user_name));
+ DEBUG(10,("get_alias_user_groups: looking for gid %d of user %s\n", (int)gid, user_name));
- if(!get_group_from_gid(*gid, &map, MAPPING_WITHOUT_PRIV)) {
+ if(!get_group_from_gid(gid, &map, MAPPING_WITHOUT_PRIV)) {
DEBUG(0,("get_alias_user_groups: gid of user %s doesn't exist. Check your /etc/passwd and /etc/group files\n", user_name));
goto done;
}