From 283991e1fff8b74af693aeb634143b10b5e939c8 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 19 May 2005 15:45:25 +0000 Subject: r6907: Unixinfo for samba4, not activated by default. Volker (This used to be commit 81ddffde369c5b5e91bc130510f43c6841a789c4) --- source4/rpc_server/unixinfo/dcesrv_unixinfo.c | 174 ++++++++++++++++++++++++++ 1 file changed, 174 insertions(+) create mode 100644 source4/rpc_server/unixinfo/dcesrv_unixinfo.c (limited to 'source4/rpc_server/unixinfo/dcesrv_unixinfo.c') diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c new file mode 100644 index 0000000000..b85d3f144e --- /dev/null +++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c @@ -0,0 +1,174 @@ +/* + Unix SMB/CIFS implementation. + + endpoint server for the unixinfo pipe + + Copyright (C) Volker Lendecke 2005 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#include "includes.h" +#include "rpc_server/dcerpc_server.h" +#include "rpc_server/common/common.h" +#include "librpc/gen_ndr/ndr_unixinfo.h" +#include "lib/events/events.h" + +#include +#include + +static NTSTATUS unixinfo_SidToUid(struct dcesrv_call_state *dce_call, + TALLOC_CTX *mem_ctx, + struct unixinfo_SidToUid *r) +{ + struct sidmap_context *sidmap; + uid_t uid; + + sidmap = sidmap_open(mem_ctx); + if (sidmap == NULL) { + DEBUG(10, ("sidmap_open failed\n")); + return NT_STATUS_NO_MEMORY; + } + + r->out.result = sidmap_sid_to_unixuid(sidmap, &r->in.sid, &uid); + + if (NT_STATUS_IS_OK(r->out.result)) { + r->out.uid = uid; + } + + return r->out.result; +} + +static NTSTATUS unixinfo_UidToSid(struct dcesrv_call_state *dce_call, + TALLOC_CTX *mem_ctx, + struct unixinfo_UidToSid *r) +{ + struct sidmap_context *sidmap; + uid_t uid; + + sidmap = sidmap_open(mem_ctx); + if (sidmap == NULL) { + DEBUG(10, ("sidmap_open failed\n")); + return NT_STATUS_NO_MEMORY; + } + + uid = r->in.uid; /* This cuts uid to (probably) 32 bit */ + + if ((uint64_t)uid != r->in.uid) { + DEBUG(10, ("uid out of range\n")); + return NT_STATUS_INVALID_PARAMETER; + } + + r->out.sid = NULL; + r->out.result = sidmap_uid_to_sid(sidmap, mem_ctx, uid, &r->out.sid); + return r->out.result; +} + +static NTSTATUS unixinfo_SidToGid(struct dcesrv_call_state *dce_call, + TALLOC_CTX *mem_ctx, + struct unixinfo_SidToGid *r) +{ + struct sidmap_context *sidmap; + gid_t gid; + + sidmap = sidmap_open(mem_ctx); + if (sidmap == NULL) { + DEBUG(10, ("sidmap_open failed\n")); + return NT_STATUS_NO_MEMORY; + } + + r->out.result = sidmap_sid_to_unixgid(sidmap, &r->in.sid, &gid); + + if (NT_STATUS_IS_OK(r->out.result)) { + r->out.gid = gid; + } + + return r->out.result; +} + +static NTSTATUS unixinfo_GidToSid(struct dcesrv_call_state *dce_call, + TALLOC_CTX *mem_ctx, + struct unixinfo_GidToSid *r) +{ + struct sidmap_context *sidmap; + gid_t gid; + + sidmap = sidmap_open(mem_ctx); + if (sidmap == NULL) { + DEBUG(10, ("sidmap_open failed\n")); + return NT_STATUS_NO_MEMORY; + } + + gid = r->in.gid; /* This cuts gid to (probably) 32 bit */ + + if ((uint64_t)gid != r->in.gid) { + DEBUG(10, ("gid out of range\n")); + return NT_STATUS_INVALID_PARAMETER; + } + + r->out.sid = NULL; + r->out.result = sidmap_gid_to_sid(sidmap, mem_ctx, gid, &r->out.sid); + return r->out.result; +} + +static NTSTATUS unixinfo_GetPWUid(struct dcesrv_call_state *dce_call, + TALLOC_CTX *mem_ctx, + struct unixinfo_GetPWUid *r) +{ + int i; + + r->out.infos = talloc_zero_array(mem_ctx, struct unixinfo_GetPWUidInfo, + r->in.count); + if (r->out.infos == NULL) { + DEBUG(0, ("talloc failed\n")); + return NT_STATUS_NO_MEMORY; + } + + r->out.result = NT_STATUS_OK; + r->out.count = r->in.count; + + for (i=0; iin.count; i++) { + uid_t uid; + struct passwd *pwd; + + uid = r->in.uids[i]; + pwd = getpwuid(uid); + if (pwd == NULL) { + DEBUG(10, ("uid %d not found\n", uid)); + r->out.infos[i].homedir = ""; + r->out.infos[i].shell = ""; + r->out.infos[i].status = NT_STATUS_NO_SUCH_USER; + continue; + } + + r->out.infos[i].homedir = talloc_strdup(mem_ctx, pwd->pw_dir); + r->out.infos[i].shell = talloc_strdup(mem_ctx, pwd->pw_shell); + + if ((r->out.infos[i].homedir == NULL) || + (r->out.infos[i].shell == NULL)) { + r->out.infos[i].homedir = ""; + r->out.infos[i].shell = ""; + r->out.infos[i].status = NT_STATUS_NO_MEMORY; + continue; + } + + r->out.infos[i].status = NT_STATUS_OK; + } + + return NT_STATUS_OK; +} + +/* include the generated boilerplate */ +#include "librpc/gen_ndr/ndr_unixinfo_s.c" -- cgit From dfc517b05395d925a4d7b1ce9633a849f9468e70 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 23 Feb 2006 15:52:24 +0000 Subject: r13658: More moving around of files: - Collect the generic utility functions into a lib/util/ (a la GLib is for the GNOME folks) - Remove even more files from include/ (This used to be commit ba62880f5b05c2a505dc7f54676b231197a7e707) --- source4/rpc_server/unixinfo/dcesrv_unixinfo.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/rpc_server/unixinfo/dcesrv_unixinfo.c') diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c index b85d3f144e..1224daa76a 100644 --- a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c +++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c @@ -25,6 +25,7 @@ #include "rpc_server/common/common.h" #include "librpc/gen_ndr/ndr_unixinfo.h" #include "lib/events/events.h" +#include "ntvfs/ntvfs.h" #include #include -- cgit From d41b55618fcbdfe55843b1a2a8bf9c2c7196751b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 11 Mar 2006 10:45:40 +0000 Subject: r14206: fix warnings, the better fix for that will be to make the sidmap code independend of ntvfs...(later...) metze (This used to be commit 2a34ed7a07c9e5f32408a0edb714239714eb1d26) --- source4/rpc_server/unixinfo/dcesrv_unixinfo.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/rpc_server/unixinfo/dcesrv_unixinfo.c') diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c index 1224daa76a..3aa18dfe77 100644 --- a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c +++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c @@ -25,6 +25,7 @@ #include "rpc_server/common/common.h" #include "librpc/gen_ndr/ndr_unixinfo.h" #include "lib/events/events.h" +#include "smb.h" #include "ntvfs/ntvfs.h" #include -- cgit From e3f2414cf9e582a4e4deecc662b64a7bb2679a34 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 14 Mar 2006 15:03:25 +0000 Subject: r14380: Reduce the size of structs.h (This used to be commit 1a16a6f1dfa66499af43a6b88b3ea69a6a75f1fe) --- source4/rpc_server/unixinfo/dcesrv_unixinfo.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/rpc_server/unixinfo/dcesrv_unixinfo.c') diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c index 3aa18dfe77..fe608524a1 100644 --- a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c +++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c @@ -26,6 +26,7 @@ #include "librpc/gen_ndr/ndr_unixinfo.h" #include "lib/events/events.h" #include "smb.h" +#include "smb_server/smb_server.h" #include "ntvfs/ntvfs.h" #include -- cgit From ad06a8bd651e3a8b598c92a356ac1ce4117ae72e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sun, 26 Mar 2006 01:23:40 +0000 Subject: r14736: - the ntvfs subsystem should not know about smb_server.h - the process module subsystem should not know about smb_server.h - the smb_server module should not know about process models metze (This used to be commit bac95bb8f4ad35a31ee666f5916ff9b2f292d964) --- source4/rpc_server/unixinfo/dcesrv_unixinfo.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'source4/rpc_server/unixinfo/dcesrv_unixinfo.c') diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c index fe608524a1..1224daa76a 100644 --- a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c +++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c @@ -25,8 +25,6 @@ #include "rpc_server/common/common.h" #include "librpc/gen_ndr/ndr_unixinfo.h" #include "lib/events/events.h" -#include "smb.h" -#include "smb_server/smb_server.h" #include "ntvfs/ntvfs.h" #include -- cgit From 05c53f70f0e4b94cf26a433cb61b1706f7715757 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 31 Mar 2006 09:47:57 +0000 Subject: r14838: fix the build. Looks like I still haven't quite got the hang of the new dependency/proto system :-) (This used to be commit 63ae3f21e3471895ba83df1c2fdc4147090f7fdb) --- source4/rpc_server/unixinfo/dcesrv_unixinfo.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/rpc_server/unixinfo/dcesrv_unixinfo.c') diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c index 1224daa76a..57562e940f 100644 --- a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c +++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c @@ -26,6 +26,7 @@ #include "librpc/gen_ndr/ndr_unixinfo.h" #include "lib/events/events.h" #include "ntvfs/ntvfs.h" +#include "ntvfs/common/proto.h" #include #include -- cgit From 2e894625e7c951b5ee66670124b4bef82a8129d9 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 7 Apr 2006 13:15:46 +0000 Subject: r14964: - move sidmap code from ntvfs_common to SAMDB - make ntvfs_common a library - create sys_notify library metze (This used to be commit a3e1d56cf7b688c515f5d6d4d43e0b24c2261d15) --- source4/rpc_server/unixinfo/dcesrv_unixinfo.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source4/rpc_server/unixinfo/dcesrv_unixinfo.c') diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c index 57562e940f..d186d7e346 100644 --- a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c +++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c @@ -25,8 +25,7 @@ #include "rpc_server/common/common.h" #include "librpc/gen_ndr/ndr_unixinfo.h" #include "lib/events/events.h" -#include "ntvfs/ntvfs.h" -#include "ntvfs/common/proto.h" +#include "dsdb/samdb/samdb.h" #include #include -- cgit From 2a8925ad2509e1e777e4eb3e7712a5cf68847ab5 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sun, 7 May 2006 21:56:26 +0000 Subject: r15507: if we change the idl, we need to change the calling code too:-) is it possible to run the RPC-UNIXINFO test in samba4's make test? metze (This used to be commit a00063eeb308dae8396e3b79ed5dd7884652f1ba) --- source4/rpc_server/unixinfo/dcesrv_unixinfo.c | 45 +++++++++++---------------- 1 file changed, 18 insertions(+), 27 deletions(-) (limited to 'source4/rpc_server/unixinfo/dcesrv_unixinfo.c') diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c index d186d7e346..1f682a6d5a 100644 --- a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c +++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c @@ -34,6 +34,7 @@ static NTSTATUS unixinfo_SidToUid(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct unixinfo_SidToUid *r) { + NTSTATUS status; struct sidmap_context *sidmap; uid_t uid; @@ -43,13 +44,11 @@ static NTSTATUS unixinfo_SidToUid(struct dcesrv_call_state *dce_call, return NT_STATUS_NO_MEMORY; } - r->out.result = sidmap_sid_to_unixuid(sidmap, &r->in.sid, &uid); + status = sidmap_sid_to_unixuid(sidmap, &r->in.sid, &uid); + NT_STATUS_NOT_OK_RETURN(status); - if (NT_STATUS_IS_OK(r->out.result)) { - r->out.uid = uid; - } - - return r->out.result; + *r->out.uid = uid; + return NT_STATUS_OK; } static NTSTATUS unixinfo_UidToSid(struct dcesrv_call_state *dce_call, @@ -72,15 +71,14 @@ static NTSTATUS unixinfo_UidToSid(struct dcesrv_call_state *dce_call, return NT_STATUS_INVALID_PARAMETER; } - r->out.sid = NULL; - r->out.result = sidmap_uid_to_sid(sidmap, mem_ctx, uid, &r->out.sid); - return r->out.result; + return sidmap_uid_to_sid(sidmap, mem_ctx, uid, &r->out.sid); } static NTSTATUS unixinfo_SidToGid(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct unixinfo_SidToGid *r) { + NTSTATUS status; struct sidmap_context *sidmap; gid_t gid; @@ -90,13 +88,11 @@ static NTSTATUS unixinfo_SidToGid(struct dcesrv_call_state *dce_call, return NT_STATUS_NO_MEMORY; } - r->out.result = sidmap_sid_to_unixgid(sidmap, &r->in.sid, &gid); - - if (NT_STATUS_IS_OK(r->out.result)) { - r->out.gid = gid; - } + status = sidmap_sid_to_unixgid(sidmap, &r->in.sid, &gid); + NT_STATUS_NOT_OK_RETURN(status); - return r->out.result; + *r->out.gid = gid; + return NT_STATUS_OK; } static NTSTATUS unixinfo_GidToSid(struct dcesrv_call_state *dce_call, @@ -119,9 +115,7 @@ static NTSTATUS unixinfo_GidToSid(struct dcesrv_call_state *dce_call, return NT_STATUS_INVALID_PARAMETER; } - r->out.sid = NULL; - r->out.result = sidmap_gid_to_sid(sidmap, mem_ctx, gid, &r->out.sid); - return r->out.result; + return sidmap_gid_to_sid(sidmap, mem_ctx, gid, &r->out.sid); } static NTSTATUS unixinfo_GetPWUid(struct dcesrv_call_state *dce_call, @@ -130,17 +124,14 @@ static NTSTATUS unixinfo_GetPWUid(struct dcesrv_call_state *dce_call, { int i; - r->out.infos = talloc_zero_array(mem_ctx, struct unixinfo_GetPWUidInfo, - r->in.count); - if (r->out.infos == NULL) { - DEBUG(0, ("talloc failed\n")); - return NT_STATUS_NO_MEMORY; - } + *r->out.count = 0; - r->out.result = NT_STATUS_OK; - r->out.count = r->in.count; + r->out.infos = talloc_zero_array(mem_ctx, struct unixinfo_GetPWUidInfo, + *r->in.count); + NT_STATUS_HAVE_NO_MEMORY(r->out.infos); + *r->out.count = *r->in.count; - for (i=0; iin.count; i++) { + for (i=0; i < *r->in.count; i++) { uid_t uid; struct passwd *pwd; -- cgit From c2387587cb9c43c5f642554be9f08cc4ab0badc9 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 9 Sep 2006 02:12:09 +0000 Subject: r18280: more portability tidyups, ensuring we use libreplace everywhere (This used to be commit 4860d0256547b33709cdc109bdf7bb0310c2a5b6) --- source4/rpc_server/unixinfo/dcesrv_unixinfo.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'source4/rpc_server/unixinfo/dcesrv_unixinfo.c') diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c index 1f682a6d5a..ab7a61c64e 100644 --- a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c +++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c @@ -26,9 +26,7 @@ #include "librpc/gen_ndr/ndr_unixinfo.h" #include "lib/events/events.h" #include "dsdb/samdb/samdb.h" - -#include -#include +#include "system/passwd.h" static NTSTATUS unixinfo_SidToUid(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, -- cgit From 64e88a8ccf2faa34ee9d182f4e89fa6e44c609a6 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 17 Jan 2007 14:49:36 +0000 Subject: r20850: Prefix all server calls with dcesrv_ (This used to be commit 76c78b0339cd88c61a13745f7f4e037f400db21b) --- source4/rpc_server/unixinfo/dcesrv_unixinfo.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source4/rpc_server/unixinfo/dcesrv_unixinfo.c') diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c index ab7a61c64e..e5803b5f00 100644 --- a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c +++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c @@ -28,7 +28,7 @@ #include "dsdb/samdb/samdb.h" #include "system/passwd.h" -static NTSTATUS unixinfo_SidToUid(struct dcesrv_call_state *dce_call, +static NTSTATUS dcesrv_unixinfo_SidToUid(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct unixinfo_SidToUid *r) { @@ -49,7 +49,7 @@ static NTSTATUS unixinfo_SidToUid(struct dcesrv_call_state *dce_call, return NT_STATUS_OK; } -static NTSTATUS unixinfo_UidToSid(struct dcesrv_call_state *dce_call, +static NTSTATUS dcesrv_unixinfo_UidToSid(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct unixinfo_UidToSid *r) { @@ -72,7 +72,7 @@ static NTSTATUS unixinfo_UidToSid(struct dcesrv_call_state *dce_call, return sidmap_uid_to_sid(sidmap, mem_ctx, uid, &r->out.sid); } -static NTSTATUS unixinfo_SidToGid(struct dcesrv_call_state *dce_call, +static NTSTATUS dcesrv_unixinfo_SidToGid(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct unixinfo_SidToGid *r) { @@ -93,7 +93,7 @@ static NTSTATUS unixinfo_SidToGid(struct dcesrv_call_state *dce_call, return NT_STATUS_OK; } -static NTSTATUS unixinfo_GidToSid(struct dcesrv_call_state *dce_call, +static NTSTATUS dcesrv_unixinfo_GidToSid(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct unixinfo_GidToSid *r) { @@ -116,7 +116,7 @@ static NTSTATUS unixinfo_GidToSid(struct dcesrv_call_state *dce_call, return sidmap_gid_to_sid(sidmap, mem_ctx, gid, &r->out.sid); } -static NTSTATUS unixinfo_GetPWUid(struct dcesrv_call_state *dce_call, +static NTSTATUS dcesrv_unixinfo_GetPWUid(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct unixinfo_GetPWUid *r) { -- cgit From 0479a2f1cbae51fcd8dbdc3c148c808421fb4d25 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 10 Jul 2007 02:07:03 +0000 Subject: r23792: convert Samba4 to GPLv3 There are still a few tidyups of old FSF addresses to come (in both s3 and s4). More commits soon. (This used to be commit fcf38a38ac691abd0fa51b89dc951a08e89fdafa) --- source4/rpc_server/unixinfo/dcesrv_unixinfo.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source4/rpc_server/unixinfo/dcesrv_unixinfo.c') diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c index e5803b5f00..1f9e584ecf 100644 --- a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c +++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c @@ -7,7 +7,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -16,8 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program. If not, see . */ #include "includes.h" -- cgit From 51db4c3f3d81d1ed03beae6426786c843ac59807 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 2 Dec 2007 17:56:09 +0100 Subject: r26228: Store loadparm context in auth context, move more loadparm_contexts up the call stack. (This used to be commit ba75f1613a9aac69dd5df94dd8a2b37820acd166) --- source4/rpc_server/unixinfo/dcesrv_unixinfo.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'source4/rpc_server/unixinfo/dcesrv_unixinfo.c') diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c index 1f9e584ecf..290cfda640 100644 --- a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c +++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c @@ -26,6 +26,7 @@ #include "lib/events/events.h" #include "dsdb/samdb/samdb.h" #include "system/passwd.h" +#include "param/param.h" static NTSTATUS dcesrv_unixinfo_SidToUid(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, @@ -35,7 +36,7 @@ static NTSTATUS dcesrv_unixinfo_SidToUid(struct dcesrv_call_state *dce_call, struct sidmap_context *sidmap; uid_t uid; - sidmap = sidmap_open(mem_ctx); + sidmap = sidmap_open(mem_ctx, global_loadparm); if (sidmap == NULL) { DEBUG(10, ("sidmap_open failed\n")); return NT_STATUS_NO_MEMORY; @@ -55,7 +56,7 @@ static NTSTATUS dcesrv_unixinfo_UidToSid(struct dcesrv_call_state *dce_call, struct sidmap_context *sidmap; uid_t uid; - sidmap = sidmap_open(mem_ctx); + sidmap = sidmap_open(mem_ctx, global_loadparm); if (sidmap == NULL) { DEBUG(10, ("sidmap_open failed\n")); return NT_STATUS_NO_MEMORY; @@ -79,7 +80,7 @@ static NTSTATUS dcesrv_unixinfo_SidToGid(struct dcesrv_call_state *dce_call, struct sidmap_context *sidmap; gid_t gid; - sidmap = sidmap_open(mem_ctx); + sidmap = sidmap_open(mem_ctx, global_loadparm); if (sidmap == NULL) { DEBUG(10, ("sidmap_open failed\n")); return NT_STATUS_NO_MEMORY; @@ -99,7 +100,7 @@ static NTSTATUS dcesrv_unixinfo_GidToSid(struct dcesrv_call_state *dce_call, struct sidmap_context *sidmap; gid_t gid; - sidmap = sidmap_open(mem_ctx); + sidmap = sidmap_open(mem_ctx, global_loadparm); if (sidmap == NULL) { DEBUG(10, ("sidmap_open failed\n")); return NT_STATUS_NO_MEMORY; -- cgit From 57f20ccd242e45ff91850341594aa040d113c19e Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 4 Dec 2007 20:05:00 +0100 Subject: r26296: Store loadparm context in DCE/RPC server context. (This used to be commit fc1f4d2d65d4c983cba5421e7ffb64dd75482860) --- source4/rpc_server/unixinfo/dcesrv_unixinfo.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/rpc_server/unixinfo/dcesrv_unixinfo.c') diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c index 290cfda640..2c08d501d1 100644 --- a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c +++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c @@ -36,7 +36,7 @@ static NTSTATUS dcesrv_unixinfo_SidToUid(struct dcesrv_call_state *dce_call, struct sidmap_context *sidmap; uid_t uid; - sidmap = sidmap_open(mem_ctx, global_loadparm); + sidmap = sidmap_open(mem_ctx, dce_call->conn->dce_ctx->lp_ctx); if (sidmap == NULL) { DEBUG(10, ("sidmap_open failed\n")); return NT_STATUS_NO_MEMORY; @@ -56,7 +56,7 @@ static NTSTATUS dcesrv_unixinfo_UidToSid(struct dcesrv_call_state *dce_call, struct sidmap_context *sidmap; uid_t uid; - sidmap = sidmap_open(mem_ctx, global_loadparm); + sidmap = sidmap_open(mem_ctx, dce_call->conn->dce_ctx->lp_ctx); if (sidmap == NULL) { DEBUG(10, ("sidmap_open failed\n")); return NT_STATUS_NO_MEMORY; @@ -80,7 +80,7 @@ static NTSTATUS dcesrv_unixinfo_SidToGid(struct dcesrv_call_state *dce_call, struct sidmap_context *sidmap; gid_t gid; - sidmap = sidmap_open(mem_ctx, global_loadparm); + sidmap = sidmap_open(mem_ctx, dce_call->conn->dce_ctx->lp_ctx); if (sidmap == NULL) { DEBUG(10, ("sidmap_open failed\n")); return NT_STATUS_NO_MEMORY; @@ -100,7 +100,7 @@ static NTSTATUS dcesrv_unixinfo_GidToSid(struct dcesrv_call_state *dce_call, struct sidmap_context *sidmap; gid_t gid; - sidmap = sidmap_open(mem_ctx, global_loadparm); + sidmap = sidmap_open(mem_ctx, dce_call->conn->dce_ctx->lp_ctx); if (sidmap == NULL) { DEBUG(10, ("sidmap_open failed\n")); return NT_STATUS_NO_MEMORY; -- cgit From 48b3c38f0f82691f4e0e749176f419744947ac14 Mon Sep 17 00:00:00 2001 From: Kai Blin Date: Wed, 19 Mar 2008 19:34:32 +0100 Subject: rpc_server: Use wbclient instead of sidmap in unixinfo pipe (This used to be commit 033db9730f1aa6d1941fbb83f55578aaa75e28bd) --- source4/rpc_server/unixinfo/dcesrv_unixinfo.c | 160 +++++++++++++++++++------- 1 file changed, 119 insertions(+), 41 deletions(-) (limited to 'source4/rpc_server/unixinfo/dcesrv_unixinfo.c') diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c index 2c08d501d1..e6313b771c 100644 --- a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c +++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c @@ -23,53 +23,100 @@ #include "rpc_server/dcerpc_server.h" #include "rpc_server/common/common.h" #include "librpc/gen_ndr/ndr_unixinfo.h" +#include "libcli/wbclient/wbclient.h" #include "lib/events/events.h" -#include "dsdb/samdb/samdb.h" #include "system/passwd.h" #include "param/param.h" +static NTSTATUS dcerpc_unixinfo_bind(struct dcesrv_call_state *dce_call, + const struct dcesrv_interface *iface) +{ + struct wbc_context *wbc_ctx; + + wbc_ctx = wbc_init(dce_call->context, dce_call->msg_ctx, + dce_call->event_ctx); + NT_STATUS_HAVE_NO_MEMORY(wbc_ctx); + + dce_call->context->private = wbc_ctx; + + return NT_STATUS_OK; +} + +#define DCESRV_INTERFACE_UNIXINFO_BIND dcerpc_unixinfo_bind + static NTSTATUS dcesrv_unixinfo_SidToUid(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct unixinfo_SidToUid *r) { NTSTATUS status; - struct sidmap_context *sidmap; - uid_t uid; + struct wbc_context *wbc_ctx = talloc_get_type_abort( + dce_call->context->private, + struct wbc_context); + struct id_mapping *ids; + struct composite_context *ctx; - sidmap = sidmap_open(mem_ctx, dce_call->conn->dce_ctx->lp_ctx); - if (sidmap == NULL) { - DEBUG(10, ("sidmap_open failed\n")); - return NT_STATUS_NO_MEMORY; - } + DEBUG(5, ("dcesrv_unixinfo_SidToUid called\n")); + + ids = talloc(mem_ctx, struct id_mapping); + NT_STATUS_HAVE_NO_MEMORY(ids); - status = sidmap_sid_to_unixuid(sidmap, &r->in.sid, &uid); + ids->sid = &r->in.sid; + ids->status = NT_STATUS_NONE_MAPPED; + ids->unixid = NULL; + ctx = wbc_sids_to_xids_send(wbc_ctx, ids, 1, ids); + NT_STATUS_HAVE_NO_MEMORY(ctx); + + status = wbc_sids_to_xids_recv(ctx, &ids); NT_STATUS_NOT_OK_RETURN(status); - *r->out.uid = uid; - return NT_STATUS_OK; + if (ids->unixid->type == ID_TYPE_BOTH || + ids->unixid->type == ID_TYPE_UID) { + *r->out.uid = ids->unixid->id; + return NT_STATUS_OK; + } else { + return NT_STATUS_INVALID_SID; + } } static NTSTATUS dcesrv_unixinfo_UidToSid(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct unixinfo_UidToSid *r) { - struct sidmap_context *sidmap; - uid_t uid; - - sidmap = sidmap_open(mem_ctx, dce_call->conn->dce_ctx->lp_ctx); - if (sidmap == NULL) { - DEBUG(10, ("sidmap_open failed\n")); - return NT_STATUS_NO_MEMORY; - } + struct wbc_context *wbc_ctx = talloc_get_type_abort( + dce_call->context->private, + struct wbc_context); + struct id_mapping *ids; + struct composite_context *ctx; + uint32_t uid; + NTSTATUS status; - uid = r->in.uid; /* This cuts uid to (probably) 32 bit */ + DEBUG(5, ("dcesrv_unixinfo_UidToSid called\n")); + uid = r->in.uid; /* This cuts uid to 32 bit */ if ((uint64_t)uid != r->in.uid) { DEBUG(10, ("uid out of range\n")); return NT_STATUS_INVALID_PARAMETER; } - return sidmap_uid_to_sid(sidmap, mem_ctx, uid, &r->out.sid); + ids = talloc(mem_ctx, struct id_mapping); + NT_STATUS_HAVE_NO_MEMORY(ids); + + ids->sid = NULL; + ids->status = NT_STATUS_NONE_MAPPED; + ids->unixid = talloc(ids, struct unixid); + NT_STATUS_HAVE_NO_MEMORY(ids->unixid); + + ids->unixid->id = uid; + ids->unixid->type = ID_TYPE_UID; + + ctx = wbc_xids_to_sids_send(wbc_ctx, ids, 1, ids); + NT_STATUS_HAVE_NO_MEMORY(ctx); + + status = wbc_xids_to_sids_recv(ctx, &ids); + NT_STATUS_NOT_OK_RETURN(status); + + r->out.sid = ids->sid; + return NT_STATUS_OK; } static NTSTATUS dcesrv_unixinfo_SidToGid(struct dcesrv_call_state *dce_call, @@ -77,43 +124,74 @@ static NTSTATUS dcesrv_unixinfo_SidToGid(struct dcesrv_call_state *dce_call, struct unixinfo_SidToGid *r) { NTSTATUS status; - struct sidmap_context *sidmap; - gid_t gid; + struct wbc_context *wbc_ctx = talloc_get_type_abort( + dce_call->context->private, + struct wbc_context); + struct id_mapping *ids; + struct composite_context *ctx; - sidmap = sidmap_open(mem_ctx, dce_call->conn->dce_ctx->lp_ctx); - if (sidmap == NULL) { - DEBUG(10, ("sidmap_open failed\n")); - return NT_STATUS_NO_MEMORY; - } + DEBUG(5, ("dcesrv_unixinfo_SidToGid called\n")); - status = sidmap_sid_to_unixgid(sidmap, &r->in.sid, &gid); + ids = talloc(mem_ctx, struct id_mapping); + NT_STATUS_HAVE_NO_MEMORY(ids); + + ids->sid = &r->in.sid; + ids->status = NT_STATUS_NONE_MAPPED; + ids->unixid = NULL; + ctx = wbc_sids_to_xids_send(wbc_ctx, ids, 1, ids); + NT_STATUS_HAVE_NO_MEMORY(ctx); + + status = wbc_sids_to_xids_recv(ctx, &ids); NT_STATUS_NOT_OK_RETURN(status); - *r->out.gid = gid; - return NT_STATUS_OK; + if (ids->unixid->type == ID_TYPE_BOTH || + ids->unixid->type == ID_TYPE_GID) { + *r->out.gid = ids->unixid->id; + return NT_STATUS_OK; + } else { + return NT_STATUS_INVALID_SID; + } } static NTSTATUS dcesrv_unixinfo_GidToSid(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct unixinfo_GidToSid *r) { - struct sidmap_context *sidmap; - gid_t gid; - - sidmap = sidmap_open(mem_ctx, dce_call->conn->dce_ctx->lp_ctx); - if (sidmap == NULL) { - DEBUG(10, ("sidmap_open failed\n")); - return NT_STATUS_NO_MEMORY; - } + struct wbc_context *wbc_ctx = talloc_get_type_abort( + dce_call->context->private, + struct wbc_context); + struct id_mapping *ids; + struct composite_context *ctx; + uint32_t gid; + NTSTATUS status; - gid = r->in.gid; /* This cuts gid to (probably) 32 bit */ + DEBUG(5, ("dcesrv_unixinfo_GidToSid called\n")); + gid = r->in.gid; /* This cuts gid to 32 bit */ if ((uint64_t)gid != r->in.gid) { DEBUG(10, ("gid out of range\n")); return NT_STATUS_INVALID_PARAMETER; } - return sidmap_gid_to_sid(sidmap, mem_ctx, gid, &r->out.sid); + ids = talloc(mem_ctx, struct id_mapping); + NT_STATUS_HAVE_NO_MEMORY(ids); + + ids->sid = NULL; + ids->status = NT_STATUS_NONE_MAPPED; + ids->unixid = talloc(ids, struct unixid); + NT_STATUS_HAVE_NO_MEMORY(ids->unixid); + + ids->unixid->id = gid; + ids->unixid->type = ID_TYPE_GID; + + ctx = wbc_xids_to_sids_send(wbc_ctx, ids, 1, ids); + NT_STATUS_HAVE_NO_MEMORY(ctx); + + status = wbc_xids_to_sids_recv(ctx, &ids); + NT_STATUS_NOT_OK_RETURN(status); + + r->out.sid = ids->sid; + return NT_STATUS_OK; } static NTSTATUS dcesrv_unixinfo_GetPWUid(struct dcesrv_call_state *dce_call, -- cgit