diff options
| author | Volker Lendecke <vl@samba.org> | 2015-08-18 17:34:29 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2015-08-31 10:18:16 +0200 |
| commit | 64450da768406a8ab4ad7f3830dd5f36081cbac7 (patch) | |
| tree | a1a4296693f0d719a1b824f095bb3be256f6750e | |
| parent | 9de5e9bc471ed0a37763f9ee0313068ef71a3c58 (diff) | |
| download | samba-64450da768406a8ab4ad7f3830dd5f36081cbac7.tar.gz | |
idmap: Remove "domname" from idmap_backends_unixid_to_sid
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Bug: https://bugzilla.samba.org/show_bug.cgi?id=11464
(cherry picked from commit ac4cc243771fc3273872547087679db21c9bb1cb)
| -rw-r--r-- | source3/torture/test_idmap_tdb_common.c | 2 | ||||
| -rw-r--r-- | source3/winbindd/idmap.c | 7 | ||||
| -rw-r--r-- | source3/winbindd/idmap_proto.h | 3 | ||||
| -rw-r--r-- | source3/winbindd/idmap_util.c | 4 |
4 files changed, 7 insertions, 9 deletions
diff --git a/source3/torture/test_idmap_tdb_common.c b/source3/torture/test_idmap_tdb_common.c index f7262a24107..dd736ad40c2 100644 --- a/source3/torture/test_idmap_tdb_common.c +++ b/source3/torture/test_idmap_tdb_common.c @@ -62,7 +62,7 @@ bool idmap_is_online(void) return true; } -NTSTATUS idmap_backends_unixid_to_sid(const char *domname, struct id_map *id) +NTSTATUS idmap_backends_unixid_to_sid(struct id_map *id) { return NT_STATUS_OK; } diff --git a/source3/winbindd/idmap.c b/source3/winbindd/idmap.c index 24277cac008..8de8990d6e6 100644 --- a/source3/winbindd/idmap.c +++ b/source3/winbindd/idmap.c @@ -502,7 +502,7 @@ NTSTATUS idmap_allocate_gid(struct unixid *id) return idmap_allocate_unixid(id); } -NTSTATUS idmap_backends_unixid_to_sid(const char *domname, struct id_map *id) +NTSTATUS idmap_backends_unixid_to_sid(struct id_map *id) { struct idmap_domain *dom; struct id_map *maps[2]; @@ -514,9 +514,8 @@ NTSTATUS idmap_backends_unixid_to_sid(const char *domname, struct id_map *id) return NT_STATUS_NONE_MAPPED; } - DEBUG(10, ("idmap_backend_unixid_to_sid: domain = '%s', xid = %d " - "(type %d)\n", - domname?domname:"NULL", id->xid.id, id->xid.type)); + DEBUG(10, ("idmap_backend_unixid_to_sid: xid = %d (type %d)\n", + id->xid.id, id->xid.type)); maps[0] = id; maps[1] = NULL; diff --git a/source3/winbindd/idmap_proto.h b/source3/winbindd/idmap_proto.h index f7af8ed639d..159aac60307 100644 --- a/source3/winbindd/idmap_proto.h +++ b/source3/winbindd/idmap_proto.h @@ -34,8 +34,7 @@ NTSTATUS smb_register_idmap(int version, const char *name, void idmap_close(void); NTSTATUS idmap_allocate_uid(struct unixid *id); NTSTATUS idmap_allocate_gid(struct unixid *id); -NTSTATUS idmap_backends_unixid_to_sid(const char *domname, - struct id_map *id); +NTSTATUS idmap_backends_unixid_to_sid(struct id_map *id); /* The following definitions come from winbindd/idmap_nss.c */ diff --git a/source3/winbindd/idmap_util.c b/source3/winbindd/idmap_util.c index e671acf837e..08857ab839a 100644 --- a/source3/winbindd/idmap_util.c +++ b/source3/winbindd/idmap_util.c @@ -66,7 +66,7 @@ backend: map.xid.type = ID_TYPE_UID; map.xid.id = uid; - ret = idmap_backends_unixid_to_sid(domname, &map); + ret = idmap_backends_unixid_to_sid(&map); if ( ! NT_STATUS_IS_OK(ret)) { DEBUG(10, ("error mapping uid [%lu]: %s\n", (unsigned long)uid, nt_errstr(ret))); @@ -130,7 +130,7 @@ backend: map.xid.type = ID_TYPE_GID; map.xid.id = gid; - ret = idmap_backends_unixid_to_sid(domname, &map); + ret = idmap_backends_unixid_to_sid(&map); if ( ! NT_STATUS_IS_OK(ret)) { DEBUG(10, ("error mapping gid [%lu]: %s\n", (unsigned long)gid, nt_errstr(ret))); |