[SCM] Samba Shared Repository - branch master updated -
102028ec722d942d7f91eb92e8da4f1480d140d1
Kai Blin
kai at samba.org
Mon Dec 29 11:53:42 GMT 2008
The branch, master has been updated
via 102028ec722d942d7f91eb92e8da4f1480d140d1 (commit)
via 1180b6964f07c4f3526892a412b163348a137ccc (commit)
via 855d2a927e7badbc6bfbd358b6e94ec8bb9cb47f (commit)
via ec5ef61134ae8edd069a5cc269f8a9d6d2b4234d (commit)
via 6958fac28d47b49402dd48778563ee612f6b6549 (commit)
via d3a0a6f2b31e100b40d1050a38ffa5d2922f0794 (commit)
via 777350ee91d4551b6dd05293459366658ba51032 (commit)
via dd8d4b6fd178df6847052dac207a4aafc0697d71 (commit)
via 181d4fd31a05e5d9bbe46428a5be01bc2a9d582d (commit)
from f271469931f83c7b3cf81a9911ff15f761925ad1 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 102028ec722d942d7f91eb92e8da4f1480d140d1
Author: Kai Blin <kai at samba.org>
Date: Sun Dec 28 12:04:40 2008 +0100
s4 winbind: Copy SID to avoid "discard const" warning
commit 1180b6964f07c4f3526892a412b163348a137ccc
Author: Kai Blin <kai at samba.org>
Date: Fri Dec 26 12:45:50 2008 +0100
s4 winbind: Add support for WINBINDD_GETGRGID call
commit 855d2a927e7badbc6bfbd358b6e94ec8bb9cb47f
Author: Kai Blin <kai at samba.org>
Date: Fri Dec 26 11:32:09 2008 +0100
s4 libnet: Add support for groupinfo by sid lookup
commit ec5ef61134ae8edd069a5cc269f8a9d6d2b4234d
Author: Kai Blin <kai at samba.org>
Date: Fri Dec 26 11:08:13 2008 +0100
s4 winbind: Fix typos in debug output
commit 6958fac28d47b49402dd48778563ee612f6b6549
Author: Kai Blin <kai at samba.org>
Date: Fri Dec 26 11:04:01 2008 +0100
wbinfo4: Add --gid-info option
commit d3a0a6f2b31e100b40d1050a38ffa5d2922f0794
Author: Kai Blin <kai at samba.org>
Date: Fri Dec 26 11:02:02 2008 +0100
wbinfo: Add --gid-info option.
commit 777350ee91d4551b6dd05293459366658ba51032
Author: Kai Blin <kai at samba.org>
Date: Fri Dec 26 10:36:29 2008 +0100
s4 winbind: Add implementation for WINBINDD_GETGRNAM
commit dd8d4b6fd178df6847052dac207a4aafc0697d71
Author: Kai Blin <kai at samba.org>
Date: Fri Dec 26 10:35:00 2008 +0100
s4 winbind: Avoid a "discards const" compiler warning.
commit 181d4fd31a05e5d9bbe46428a5be01bc2a9d582d
Author: Kai Blin <kai at samba.org>
Date: Fri Dec 26 10:17:38 2008 +0100
s4 libnet: Add group_name member to struct libnet_GroupInfo's out struct.
-----------------------------------------------------------------------
Summary of changes:
nsswitch/wbinfo.c | 30 ++++++
nsswitch/wbinfo4.c | 37 +++++++
source4/libnet/libnet_group.c | 100 ++++++++++++++-----
source4/libnet/libnet_group.h | 15 +++-
source4/torture/libnet/libnet_group.c | 5 +-
source4/winbind/config.mk | 2 +
source4/winbind/wb_cmd_getgrgid.c | 177 +++++++++++++++++++++++++++++++++
source4/winbind/wb_cmd_getgrnam.c | 168 +++++++++++++++++++++++++++++++
source4/winbind/wb_cmd_getpwuid.c | 4 +-
source4/winbind/wb_init_domain.c | 3 +-
source4/winbind/wb_samba3_cmd.c | 68 ++++++++++++-
11 files changed, 573 insertions(+), 36 deletions(-)
create mode 100644 source4/winbind/wb_cmd_getgrgid.c
create mode 100644 source4/winbind/wb_cmd_getgrnam.c
Changeset truncated at 500 lines:
diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c
index 36c2818..ce53cad 100644
--- a/nsswitch/wbinfo.c
+++ b/nsswitch/wbinfo.c
@@ -223,6 +223,27 @@ static bool wbinfo_get_groupinfo(const char *group)
return true;
}
+/* pull grent for a given gid */
+static bool wbinfo_get_gidinfo(int gid)
+{
+ wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
+ struct group *grp;
+
+ wbc_status = wbcGetgrgid(gid, &grp);
+ if (!WBC_ERROR_IS_OK(wbc_status)) {
+ return false;
+ }
+
+ d_printf("%s:%s:%d\n",
+ grp->gr_name,
+ grp->gr_passwd,
+ grp->gr_gid);
+
+ wbcFreeMemory(grp);
+
+ return true;
+}
+
/* List groups a user is a member of */
static bool wbinfo_get_usergroups(const char *user)
@@ -1544,6 +1565,7 @@ enum {
OPT_LIST_OWN_DOMAIN,
OPT_UID_INFO,
OPT_GROUP_INFO,
+ OPT_GID_INFO,
OPT_VERBOSE,
OPT_ONLINESTATUS,
OPT_CHANGE_USER_PASSWORD,
@@ -1600,6 +1622,7 @@ int main(int argc, char **argv, char **envp)
{ "user-info", 'i', POPT_ARG_STRING, &string_arg, 'i', "Get user info", "USER" },
{ "uid-info", 0, POPT_ARG_INT, &int_arg, OPT_UID_INFO, "Get user info from uid", "UID" },
{ "group-info", 0, POPT_ARG_STRING, &string_arg, OPT_GROUP_INFO, "Get group info", "GROUP" },
+ { "gid-info", 0, POPT_ARG_INT, &int_arg, OPT_GID_INFO, "Get group info from gid", "GID" },
{ "user-groups", 'r', POPT_ARG_STRING, &string_arg, 'r', "Get user groups", "USER" },
{ "user-domgroups", 0, POPT_ARG_STRING, &string_arg,
OPT_USERDOMGROUPS, "Get user domain groups", "SID" },
@@ -1851,6 +1874,13 @@ int main(int argc, char **argv, char **envp)
goto done;
}
break;
+ case OPT_GID_INFO:
+ if ( !wbinfo_get_gidinfo(int_arg)) {
+ d_fprintf(stderr, "Could not get info for gid "
+ "%d\n", int_arg);
+ goto done;
+ }
+ break;
case 'r':
if (!wbinfo_get_usergroups(string_arg)) {
d_fprintf(stderr, "Could not get groups for user %s\n",
diff --git a/nsswitch/wbinfo4.c b/nsswitch/wbinfo4.c
index 465c3f7..bb6d7a8 100644
--- a/nsswitch/wbinfo4.c
+++ b/nsswitch/wbinfo4.c
@@ -213,6 +213,34 @@ static bool wbinfo_get_groupinfo(char *group)
return true;
}
+/* pull grent for a given gid */
+static bool wbinfo_get_gidinfo(int gid)
+{
+ struct winbindd_request request;
+ struct winbindd_response response;
+ NSS_STATUS result;
+
+ ZERO_STRUCT(request);
+ ZERO_STRUCT(response);
+
+ /* Send request */
+
+ request.data.gid = gid;
+
+ result = winbindd_request_response(WINBINDD_GETGRGID, &request,
+ &response);
+
+ if ( result != NSS_STATUS_SUCCESS)
+ return false;
+
+ d_printf( "%s:%s:%d\n",
+ response.data.gr.gr_name,
+ response.data.gr.gr_passwd,
+ response.data.gr.gr_gid );
+
+ return true;
+}
+
/* List groups a user is a member of */
static bool wbinfo_get_usergroups(char *user)
@@ -1005,6 +1033,7 @@ enum {
OPT_LIST_OWN_DOMAIN,
OPT_UID_INFO,
OPT_GROUP_INFO,
+ OPT_GID_INFO,
};
int main(int argc, char **argv, char **envp)
@@ -1042,6 +1071,7 @@ int main(int argc, char **argv, char **envp)
{ "user-info", 'i', POPT_ARG_STRING, &string_arg, 'i', "Get user info", "USER" },
{ "uid-info", 0, POPT_ARG_INT, &int_arg, OPT_UID_INFO, "Get user info from uid", "UID" },
{ "group-info", 0, POPT_ARG_STRING, &string_arg, OPT_GROUP_INFO, "Get group info", "GROUP" },
+ { "gid-info", 0, POPT_ARG_INT, &int_arg, OPT_GID_INFO, "Get group info from gid", "GID" },
{ "user-groups", 'r', POPT_ARG_STRING, &string_arg, 'r', "Get user groups", "USER" },
{ "user-domgroups", 0, POPT_ARG_STRING, &string_arg,
OPT_USERDOMGROUPS, "Get user domain groups", "SID" },
@@ -1192,6 +1222,13 @@ int main(int argc, char **argv, char **envp)
goto done;
}
break;
+ case OPT_GID_INFO:
+ if ( !wbinfo_get_gidinfo(int_arg)) {
+ d_fprintf(stderr, "Could not get info for gid "
+ "%d\n", int_arg);
+ goto done;
+ }
+ break;
case 'r':
if (!wbinfo_get_usergroups(string_arg)) {
d_fprintf(stderr, "Could not get groups for user %s\n",
diff --git a/source4/libnet/libnet_group.c b/source4/libnet/libnet_group.c
index af5fe4d..b066964 100644
--- a/source4/libnet/libnet_group.c
+++ b/source4/libnet/libnet_group.c
@@ -172,7 +172,9 @@ NTSTATUS libnet_CreateGroup(struct libnet_context *ctx, TALLOC_CTX *mem_ctx,
struct group_info_state {
struct libnet_context *ctx;
const char *domain_name;
+ enum libnet_GroupInfo_level level;
const char *group_name;
+ const char *sid_string;
struct libnet_LookupName lookup;
struct libnet_DomainOpen domopen;
struct libnet_rpc_groupinfo info;
@@ -203,7 +205,7 @@ struct composite_context* libnet_GroupInfo_send(struct libnet_context *ctx,
struct composite_context *c;
struct group_info_state *s;
bool prereq_met = false;
- struct composite_context *lookup_req;
+ struct composite_context *lookup_req, *info_req;
/* composite context allocation and setup */
c = composite_create(mem_ctx, ctx->event_ctx);
@@ -216,25 +218,54 @@ struct composite_context* libnet_GroupInfo_send(struct libnet_context *ctx,
/* store arguments in the state structure */
s->monitor_fn = monitor;
- s->ctx = ctx;
+ s->ctx = ctx;
s->domain_name = talloc_strdup(c, io->in.domain_name);
- s->group_name = talloc_strdup(c, io->in.group_name);
+ s->level = io->in.level;
+ switch(s->level) {
+ case GROUP_INFO_BY_NAME:
+ s->group_name = talloc_strdup(c, io->in.data.group_name);
+ s->sid_string = NULL;
+ break;
+ case GROUP_INFO_BY_SID:
+ s->group_name = NULL;
+ s->sid_string = dom_sid_string(c, io->in.data.group_sid);
+ break;
+ }
/* prerequisite: make sure the domain is opened */
prereq_met = samr_domain_opened(ctx, s->domain_name, &c, &s->domopen,
continue_domain_open_info, monitor);
if (!prereq_met) return c;
-
- /* prepare arguments for LookupName call */
- s->lookup.in.name = s->group_name;
- s->lookup.in.domain_name = s->domain_name;
- /* send the request */
- lookup_req = libnet_LookupName_send(s->ctx, c, &s->lookup, s->monitor_fn);
- if (composite_nomem(lookup_req, c)) return c;
+ switch(s->level) {
+ case GROUP_INFO_BY_NAME:
+ /* prepare arguments for LookupName call */
+ s->lookup.in.name = s->group_name;
+ s->lookup.in.domain_name = s->domain_name;
+
+ /* send the request */
+ lookup_req = libnet_LookupName_send(s->ctx, c, &s->lookup, s->monitor_fn);
+ if (composite_nomem(lookup_req, c)) return c;
+
+ /* set the next stage */
+ composite_continue(c, lookup_req, continue_name_found, c);
+ break;
+ case GROUP_INFO_BY_SID:
+ /* prepare arguments for groupinfo call */
+ s->info.in.domain_handle = s->ctx->samr.handle;
+ s->info.in.sid = s->sid_string;
+ /* we're looking for all information available */
+ s->info.in.level = GROUPINFOALL;
+
+ /* send the request */
+ info_req = libnet_rpc_groupinfo_send(s->ctx->samr.pipe, &s->info, s->monitor_fn);
+ if (composite_nomem(info_req, c)) return c;
+
+ /* set the next stage */
+ composite_continue(c, info_req, continue_group_info, c);
+ break;
+ }
- /* set the next stage */
- composite_continue(c, lookup_req, continue_name_found, c);
return c;
}
@@ -246,7 +277,7 @@ static void continue_domain_open_info(struct composite_context *ctx)
{
struct composite_context *c;
struct group_info_state *s;
- struct composite_context *lookup_req;
+ struct composite_context *lookup_req, *info_req;
c = talloc_get_type(ctx->async.private_data, struct composite_context);
s = talloc_get_type(c->private_data, struct group_info_state);
@@ -255,16 +286,35 @@ static void continue_domain_open_info(struct composite_context *ctx)
c->status = libnet_DomainOpen_recv(ctx, s->ctx, c, &s->domopen);
if (!composite_is_ok(c)) return;
- /* prepare arguments for LookupName call */
- s->lookup.in.name = s->group_name;
- s->lookup.in.domain_name = s->domain_name;
+ switch(s->level) {
+ case GROUP_INFO_BY_NAME:
+ /* prepare arguments for LookupName call */
+ s->lookup.in.name = s->group_name;
+ s->lookup.in.domain_name = s->domain_name;
+
+ /* send the request */
+ lookup_req = libnet_LookupName_send(s->ctx, c, &s->lookup, s->monitor_fn);
+ if (composite_nomem(lookup_req, c)) return;
+
+ /* set the next stage */
+ composite_continue(c, lookup_req, continue_name_found, c);
+ break;
+ case GROUP_INFO_BY_SID:
+ /* prepare arguments for groupinfo call */
+ s->info.in.domain_handle = s->ctx->samr.handle;
+ s->info.in.sid = s->sid_string;
+ /* we're looking for all information available */
+ s->info.in.level = GROUPINFOALL;
+
+ /* send the request */
+ info_req = libnet_rpc_groupinfo_send(s->ctx->samr.pipe, &s->info, s->monitor_fn);
+ if (composite_nomem(info_req, c)) return;
+
+ /* set the next stage */
+ composite_continue(c, info_req, continue_group_info, c);
+ break;
- /* send the request */
- lookup_req = libnet_LookupName_send(s->ctx, c, &s->lookup, s->monitor_fn);
- if (composite_nomem(lookup_req, c)) return;
-
- /* set the next stage */
- composite_continue(c, lookup_req, continue_name_found, c);
+ }
}
@@ -283,7 +333,7 @@ static void continue_name_found(struct composite_context *ctx)
/* receive SID assiociated with name found */
c->status = libnet_LookupName_recv(ctx, c, &s->lookup);
if (!composite_is_ok(c)) return;
-
+
/* Is is a group SID actually ? */
if (s->lookup.out.sid_type != SID_NAME_DOM_GRP &&
s->lookup.out.sid_type != SID_NAME_ALIAS) {
@@ -344,7 +394,9 @@ NTSTATUS libnet_GroupInfo_recv(struct composite_context* c, TALLOC_CTX *mem_ctx,
if (NT_STATUS_IS_OK(status)) {
/* put the results into io structure if everything went fine */
s = talloc_get_type(c->private_data, struct group_info_state);
-
+
+ io->out.group_name = talloc_steal(mem_ctx,
+ s->info.out.info.all.name.string);
io->out.group_sid = talloc_steal(mem_ctx, s->lookup.out.sid);
io->out.num_members = s->info.out.info.all.num_members;
io->out.description = talloc_steal(mem_ctx, s->info.out.info.all.description.string);
diff --git a/source4/libnet/libnet_group.h b/source4/libnet/libnet_group.h
index 3156b1f..b80d344 100644
--- a/source4/libnet/libnet_group.h
+++ b/source4/libnet/libnet_group.h
@@ -29,17 +29,26 @@ struct libnet_CreateGroup {
} out;
};
+enum libnet_GroupInfo_level {
+ GROUP_INFO_BY_NAME=0,
+ GROUP_INFO_BY_SID
+};
struct libnet_GroupInfo {
struct {
- const char *group_name;
- const char *domain_name;
+ const char *domain_name;
+ enum libnet_GroupInfo_level level;
+ union {
+ const char *group_name;
+ const struct dom_sid *group_sid;
+ } data;
} in;
struct {
+ const char *group_name;
struct dom_sid *group_sid;
uint32_t num_members;
const char *description;
-
+
const char *error_string;
} out;
};
diff --git a/source4/torture/libnet/libnet_group.c b/source4/torture/libnet/libnet_group.c
index 9c9ecfd..c7fdfbd 100644
--- a/source4/torture/libnet/libnet_group.c
+++ b/source4/torture/libnet/libnet_group.c
@@ -264,9 +264,10 @@ bool torture_groupinfo_api(struct torture_context *torture)
mem_ctx = talloc_init("torture group info");
ZERO_STRUCT(req);
-
+
req.in.domain_name = domain_name.string;
- req.in.group_name = name;
+ req.in.level = GROUP_INFO_BY_NAME;
+ req.in.data.group_name = name;
status = libnet_GroupInfo(ctx, mem_ctx, &req);
if (!NT_STATUS_IS_OK(status)) {
diff --git a/source4/winbind/config.mk b/source4/winbind/config.mk
index 7be4e3d..eb781cd 100644
--- a/source4/winbind/config.mk
+++ b/source4/winbind/config.mk
@@ -40,6 +40,8 @@ WINBIND_OBJ_FILES = $(addprefix $(winbindsrcdir)/, \
wb_cmd_lookupname.o \
wb_cmd_lookupsid.o \
wb_cmd_getdcname.o \
+ wb_cmd_getgrnam.o \
+ wb_cmd_getgrgid.o \
wb_cmd_getpwnam.o \
wb_cmd_getpwuid.o \
wb_cmd_userdomgroups.o \
diff --git a/source4/winbind/wb_cmd_getgrgid.c b/source4/winbind/wb_cmd_getgrgid.c
new file mode 100644
index 0000000..80f4e9c
--- /dev/null
+++ b/source4/winbind/wb_cmd_getgrgid.c
@@ -0,0 +1,177 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ Backend for getgrgid
+
+ Copyright (C) Kai Blin 2007
+
+ 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 3 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, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "libcli/composite/composite.h"
+#include "winbind/wb_server.h"
+#include "winbind/wb_async_helpers.h"
+#include "winbind/wb_helper.h"
+#include "smbd/service_task.h"
+#include "libnet/libnet_proto.h"
+#include "param/param.h"
+#include "libcli/security/proto.h"
+#include "auth/credentials/credentials.h"
+
+struct cmd_getgrgid_state {
+ struct composite_context *ctx;
+ struct wbsrv_service *service;
+ gid_t gid;
+ struct dom_sid *sid;
+ char *workgroup;
+ struct wbsrv_domain *domain;
+
+ struct winbindd_gr *result;
+};
+
+static void cmd_getgrgid_recv_sid(struct composite_context *ctx);
+static void cmd_getgrgid_recv_domain(struct composite_context *ctx);
+static void cmd_getgrgid_recv_group_info(struct composite_context *ctx);
+
+/* Get the SID using the gid */
+
+struct composite_context *wb_cmd_getgrgid_send(TALLOC_CTX *mem_ctx,
+ struct wbsrv_service *service,
+ gid_t gid)
+{
+ struct composite_context *ctx, *result;
+ struct cmd_getgrgid_state *state;
+
+ DEBUG(5, ("wb_cmd_getgrgid_send called\n"));
+
+ result = composite_create(mem_ctx, service->task->event_ctx);
+ if (!result) return NULL;
+
+ state = talloc(result, struct cmd_getgrgid_state);
+ if (composite_nomem(state, result)) return result;
+ state->ctx = result;
+ result->private_data = state;
+ state->service = service;
+ state->gid = gid;
+
+ ctx = wb_gid2sid_send(state, service, gid);
+ if (composite_nomem(ctx, state->ctx)) return result;
+
+ composite_continue(result, ctx, cmd_getgrgid_recv_sid, state);
+ return result;
+}
+
+
+/* Receive the sid and get the domain structure with it */
+
+static void cmd_getgrgid_recv_sid(struct composite_context *ctx)
+{
+ struct cmd_getgrgid_state *state =
+ talloc_get_type(ctx->async.private_data,
+ struct cmd_getgrgid_state);
+
+ DEBUG(5, ("cmd_getgrgid_recv_sid called %p\n", ctx->private_data));
+
+ state->ctx->status = wb_gid2sid_recv(ctx, state, &state->sid);
+ if (!composite_is_ok(state->ctx)) return;
+
+ ctx = wb_sid2domain_send(state, state->service, state->sid);
+
+ composite_continue(state->ctx, ctx, cmd_getgrgid_recv_domain, state);
+}
+
+/* Receive the domain struct and call libnet to get the user info struct */
+
+static void cmd_getgrgid_recv_domain(struct composite_context *ctx)
+{
+ struct cmd_getgrgid_state *state =
+ talloc_get_type(ctx->async.private_data,
+ struct cmd_getgrgid_state);
+ struct libnet_GroupInfo *group_info;
+
+ DEBUG(5, ("cmd_getgrgid_recv_domain called\n"));
+
+ state->ctx->status = wb_sid2domain_recv(ctx, &state->domain);
+ if (!composite_is_ok(state->ctx)) return;
+
+ group_info = talloc(state, struct libnet_GroupInfo);
+ if (composite_nomem(group_info, state->ctx)) return;
+
+ group_info->in.level = GROUP_INFO_BY_SID;
+ group_info->in.data.group_sid = state->sid;
+ group_info->in.domain_name = state->domain->libnet_ctx->samr.name;
+
+ /* We need the workgroup later, so copy it */
+ state->workgroup = talloc_strdup(state,
+ state->domain->libnet_ctx->samr.name);
+ if (composite_nomem(state->workgroup, state->ctx)) return;
+
+ ctx = libnet_GroupInfo_send(state->domain->libnet_ctx, state,group_info,
+ NULL);
+
+ composite_continue(state->ctx, ctx, cmd_getgrgid_recv_group_info,state);
+}
+
+/* Receive the group info struct */
+
+static void cmd_getgrgid_recv_group_info(struct composite_context *ctx)
+{
+ struct cmd_getgrgid_state *state =
+ talloc_get_type(ctx->async.private_data,
+ struct cmd_getgrgid_state);
+ struct libnet_GroupInfo *group_info;
+ struct winbindd_gr *gr;
+
--
Samba Shared Repository
More information about the samba-cvs
mailing list