[SCM] Samba Shared Repository - branch v3-6-test updated
Michael Adam
obnox at samba.org
Thu Jan 27 17:09:36 MST 2011
The branch, v3-6-test has been updated
via 6cdcf56 libwbclient: bump the libwbclient SOVER 0 -> 1 due to ABI changes
via 82802a4 libwbclient: bump version to 0.6 -> 1.0 due to ABI change (removed symbols)
via 08a8cb9 libwbclient: remove wbcSetGidHwm() - not implemented any more
via 4423dd7 libwbclient: remove wbcSetUidHwm() - not implemented any more
via dbee103 libwbclient: remove wbcRemoveGidMapping() - not implemented any more
via 864d201 libwbclient: remove wbcRemoveUidMapping() - not implemented any more
via c987cf6 libwbclient: remove wbcSetGidMapping() - not implemented any more
via c39ccca libwbclient: remove wbcSetUidMapping() - not implemented any more
via 41184fd libwbclient: remove two unused defines
via d229819 wbinfo: remove --remove-gid-mapping - winbindd does not implement that any more.
via 9062d12 wbinfo: remove --remove-uid-mapping - winbindd does not implement that any more.
via ac65fee wbinfo: remove --set-gid-mapping - winbindd does not implement that any more.
via d459367 wbinfo: remove --set-uid-mapping - winbindd does not implement that any more.
via 2299ed4 s3:registry: fix comments in regdb_store_regdb_version()
from 6875389 Add delete-ln test now we can correctly delete hardlinks. (cherry picked from commit 0efb143877710706cd3812ad2247813a68f2fd98)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 6cdcf562f1a64680d0407afe8cc432e2617c0b52
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 27 23:11:42 2011 +0100
libwbclient: bump the libwbclient SOVER 0 -> 1 due to ABI changes
Autobuild-User: Michael Adam <obnox at samba.org>
Autobuild-Date: Fri Jan 28 00:25:11 CET 2011 on sn-devel-104
commit 82802a41079004e128bd0574799fdca5937e2084
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 27 22:00:33 2011 +0100
libwbclient: bump version to 0.6 -> 1.0 due to ABI change (removed symbols)
commit 08a8cb9dbab5437439bf8de52ab0ee61d22c029f
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 27 21:54:25 2011 +0100
libwbclient: remove wbcSetGidHwm() - not implemented any more
commit 4423dd709e862fc470b063dc7031f6876fd8964a
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 27 21:54:25 2011 +0100
libwbclient: remove wbcSetUidHwm() - not implemented any more
commit dbee103957e5f13123c668d295e5897ddba58572
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 27 21:54:25 2011 +0100
libwbclient: remove wbcRemoveGidMapping() - not implemented any more
commit 864d201d5c6372b2335ba80f65135fcc05cee42e
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 27 21:54:25 2011 +0100
libwbclient: remove wbcRemoveUidMapping() - not implemented any more
commit c987cf6a31f170f476b31804f7be4aefd23860ea
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 27 21:54:25 2011 +0100
libwbclient: remove wbcSetGidMapping() - not implemented any more
commit c39cccafe9345934800aa3f61d91cf9b5ab52e86
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 27 21:54:25 2011 +0100
libwbclient: remove wbcSetUidMapping() - not implemented any more
commit 41184fd57384851074cbe2bfe291c8d2dcc6d1c3
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 27 21:46:12 2011 +0100
libwbclient: remove two unused defines
commit d229819e29ec11d8e5413fa8c16bdf3188962b4e
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 26 22:00:22 2011 +0100
wbinfo: remove --remove-gid-mapping - winbindd does not implement that any more.
commit 9062d12abd593f9276c2b4d57ced4e89b3e2b5ab
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 26 22:00:22 2011 +0100
wbinfo: remove --remove-uid-mapping - winbindd does not implement that any more.
commit ac65fee79df7a0c704a7fc9b5c058b7fab6d7f49
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 26 22:00:22 2011 +0100
wbinfo: remove --set-gid-mapping - winbindd does not implement that any more.
commit d459367821a3fa91f8a5d3d92839b6231d70d438
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 26 22:00:22 2011 +0100
wbinfo: remove --set-uid-mapping - winbindd does not implement that any more.
commit 2299ed4470fbb44207ff5c93e7e33605f93fc9e5
Author: Michael Adam <obnox at samba.org>
Date: Mon Jan 24 17:37:33 2011 +0100
s3:registry: fix comments in regdb_store_regdb_version()
-----------------------------------------------------------------------
Summary of changes:
nsswitch/libwbclient/wbc_idmap.c | 40 ---------
nsswitch/libwbclient/wbclient.h | 71 ++--------------
nsswitch/wbinfo.c | 166 -------------------------------------
source3/configure.in | 2 +-
source3/registry/reg_backend_db.c | 4 +-
5 files changed, 13 insertions(+), 270 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/libwbclient/wbc_idmap.c b/nsswitch/libwbclient/wbc_idmap.c
index ab8de9f..c0193ca 100644
--- a/nsswitch/libwbclient/wbc_idmap.c
+++ b/nsswitch/libwbclient/wbc_idmap.c
@@ -266,43 +266,3 @@ wbcErr wbcAllocateGid(gid_t *pgid)
done:
return wbc_status;
}
-
-/* we can't include smb.h here... */
-#define _ID_TYPE_UID 1
-#define _ID_TYPE_GID 2
-
-/* Set an user id mapping - not implemented any more */
-wbcErr wbcSetUidMapping(uid_t uid, const struct wbcDomainSid *sid)
-{
- return WBC_ERR_NOT_IMPLEMENTED;
-}
-
-/* Set a group id mapping - not implemented any more */
-wbcErr wbcSetGidMapping(gid_t gid, const struct wbcDomainSid *sid)
-{
- return WBC_ERR_NOT_IMPLEMENTED;
-}
-
-/* Remove a user id mapping - not implemented any more */
-wbcErr wbcRemoveUidMapping(uid_t uid, const struct wbcDomainSid *sid)
-{
- return WBC_ERR_NOT_IMPLEMENTED;
-}
-
-/* Remove a group id mapping - not implemented any more */
-wbcErr wbcRemoveGidMapping(gid_t gid, const struct wbcDomainSid *sid)
-{
- return WBC_ERR_NOT_IMPLEMENTED;
-}
-
-/* Set the highwater mark for allocated uids - not implemented any more */
-wbcErr wbcSetUidHwm(uid_t uid_hwm)
-{
- return WBC_ERR_NOT_IMPLEMENTED;
-}
-
-/* Set the highwater mark for allocated gids - not implemented any more */
-wbcErr wbcSetGidHwm(gid_t gid_hwm)
-{
- return WBC_ERR_NOT_IMPLEMENTED;
-}
diff --git a/nsswitch/libwbclient/wbclient.h b/nsswitch/libwbclient/wbclient.h
index 39670ab..83fe73c 100644
--- a/nsswitch/libwbclient/wbclient.h
+++ b/nsswitch/libwbclient/wbclient.h
@@ -66,9 +66,16 @@ const char *wbcErrorString(wbcErr error);
* 0.4: Added wbcSidTypeString()
* 0.5: Added wbcChangeTrustCredentials()
* 0.6: Made struct wbcInterfaceDetails char* members non-const
- **/
-#define WBCLIENT_MAJOR_VERSION 0
-#define WBCLIENT_MINOR_VERSION 6
+ * 1.0: ABI change: removed the following:
+ * wbcSetUidMapping()
+ * wbcSetGidMapping()
+ * wbcRemoveUidMapping()
+ * wbcRemoveGidMapping()
+ * wbcSetUidHwm()
+ * wbcSetGidHwm()
+ **/
+#define WBCLIENT_MAJOR_VERSION 1
+#define WBCLIENT_MINOR_VERSION 0
#define WBCLIENT_VENDOR_VERSION "Samba libwbclient"
struct wbcLibraryDetails {
uint16_t major_version;
@@ -786,64 +793,6 @@ wbcErr wbcAllocateUid(uid_t *puid);
**/
wbcErr wbcAllocateGid(gid_t *pgid);
-/**
- * @brief Set an user id mapping
- *
- * @param uid Uid of the desired mapping.
- * @param *sid Pointer to the sid of the diresired mapping.
- *
- * @return #wbcErr
- **/
-wbcErr wbcSetUidMapping(uid_t uid, const struct wbcDomainSid *sid);
-
-/**
- * @brief Set a group id mapping
- *
- * @param gid Gid of the desired mapping.
- * @param *sid Pointer to the sid of the diresired mapping.
- *
- * @return #wbcErr
- **/
-wbcErr wbcSetGidMapping(gid_t gid, const struct wbcDomainSid *sid);
-
-/**
- * @brief Remove a user id mapping
- *
- * @param uid Uid of the mapping to remove.
- * @param *sid Pointer to the sid of the mapping to remove.
- *
- * @return #wbcErr
- **/
-wbcErr wbcRemoveUidMapping(uid_t uid, const struct wbcDomainSid *sid);
-
-/**
- * @brief Remove a group id mapping
- *
- * @param gid Gid of the mapping to remove.
- * @param *sid Pointer to the sid of the mapping to remove.
- *
- * @return #wbcErr
- **/
-wbcErr wbcRemoveGidMapping(gid_t gid, const struct wbcDomainSid *sid);
-
-/**
- * @brief Set the highwater mark for allocated uids.
- *
- * @param uid_hwm The new uid highwater mark value
- *
- * @return #wbcErr
- **/
-wbcErr wbcSetUidHwm(uid_t uid_hwm);
-
-/**
- * @brief Set the highwater mark for allocated gids.
- *
- * @param gid_hwm The new gid highwater mark value
- *
- * @return #wbcErr
- **/
-wbcErr wbcSetGidHwm(gid_t gid_hwm);
-
/**********************************************************
* NSS Lookup User/Group details
**********************************************************/
diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c
index caa37f3..a4b2a3c 100644
--- a/nsswitch/wbinfo.c
+++ b/nsswitch/wbinfo.c
@@ -1040,122 +1040,6 @@ static bool wbinfo_allocate_gid(void)
return true;
}
-static bool wbinfo_set_uid_mapping(uid_t uid, const char *sid_str)
-{
- wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
- struct wbcDomainSid sid;
-
- /* Send request */
-
- wbc_status = wbcStringToSid(sid_str, &sid);
- if (!WBC_ERROR_IS_OK(wbc_status)) {
- d_fprintf(stderr, "failed to call wbcStringToSid: %s\n",
- wbcErrorString(wbc_status));
- return false;
- }
-
- wbc_status = wbcSetUidMapping(uid, &sid);
- if (!WBC_ERROR_IS_OK(wbc_status)) {
- d_fprintf(stderr, "failed to call wbcSetUidMapping: %s\n",
- wbcErrorString(wbc_status));
- return false;
- }
-
- /* Display response */
-
- d_printf("uid %u now mapped to sid %s\n",
- (unsigned int)uid, sid_str);
-
- return true;
-}
-
-static bool wbinfo_set_gid_mapping(gid_t gid, const char *sid_str)
-{
- wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
- struct wbcDomainSid sid;
-
- /* Send request */
-
- wbc_status = wbcStringToSid(sid_str, &sid);
- if (!WBC_ERROR_IS_OK(wbc_status)) {
- d_fprintf(stderr, "failed to call wbcStringToSid: %s\n",
- wbcErrorString(wbc_status));
- return false;
- }
-
- wbc_status = wbcSetGidMapping(gid, &sid);
- if (!WBC_ERROR_IS_OK(wbc_status)) {
- d_fprintf(stderr, "failed to call wbcSetGidMapping: %s\n",
- wbcErrorString(wbc_status));
- return false;
- }
-
- /* Display response */
-
- d_printf("gid %u now mapped to sid %s\n",
- (unsigned int)gid, sid_str);
-
- return true;
-}
-
-static bool wbinfo_remove_uid_mapping(uid_t uid, const char *sid_str)
-{
- wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
- struct wbcDomainSid sid;
-
- /* Send request */
-
- wbc_status = wbcStringToSid(sid_str, &sid);
- if (!WBC_ERROR_IS_OK(wbc_status)) {
- d_fprintf(stderr, "failed to call wbcStringToSid: %s\n",
- wbcErrorString(wbc_status));
- return false;
- }
-
- wbc_status = wbcRemoveUidMapping(uid, &sid);
- if (!WBC_ERROR_IS_OK(wbc_status)) {
- d_fprintf(stderr, "failed to call wbcRemoveUidMapping: %s\n",
- wbcErrorString(wbc_status));
- return false;
- }
-
- /* Display response */
-
- d_printf("Removed uid %u to sid %s mapping\n",
- (unsigned int)uid, sid_str);
-
- return true;
-}
-
-static bool wbinfo_remove_gid_mapping(gid_t gid, const char *sid_str)
-{
- wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
- struct wbcDomainSid sid;
-
- /* Send request */
-
- wbc_status = wbcStringToSid(sid_str, &sid);
- if (!WBC_ERROR_IS_OK(wbc_status)) {
- d_fprintf(stderr, "failed to call wbcStringToSid: %s\n",
- wbcErrorString(wbc_status));
- return false;
- }
-
- wbc_status = wbcRemoveGidMapping(gid, &sid);
- if (!WBC_ERROR_IS_OK(wbc_status)) {
- d_fprintf(stderr, "failed to call wbcRemoveGidMapping: %s\n",
- wbcErrorString(wbc_status));
- return false;
- }
-
- /* Display response */
-
- d_printf("Removed gid %u to sid %s mapping\n",
- (unsigned int)gid, sid_str);
-
- return true;
-}
-
/* Convert sid to string */
static bool wbinfo_lookupsid(const char *sid_str)
@@ -1952,10 +1836,6 @@ enum {
OPT_USERSIDS,
OPT_ALLOCATE_UID,
OPT_ALLOCATE_GID,
- OPT_SET_UID_MAPPING,
- OPT_SET_GID_MAPPING,
- OPT_REMOVE_UID_MAPPING,
- OPT_REMOVE_GID_MAPPING,
OPT_SEPARATOR,
OPT_LIST_ALL_DOMAINS,
OPT_LIST_OWN_DOMAIN,
@@ -2016,10 +1896,6 @@ int main(int argc, char **argv, char **envp)
"Get a new UID out of idmap" },
{ "allocate-gid", 0, POPT_ARG_NONE, 0, OPT_ALLOCATE_GID,
"Get a new GID out of idmap" },
- { "set-uid-mapping", 0, POPT_ARG_STRING, &string_arg, OPT_SET_UID_MAPPING, "Create or modify uid to sid mapping in idmap", "UID,SID" },
- { "set-gid-mapping", 0, POPT_ARG_STRING, &string_arg, OPT_SET_GID_MAPPING, "Create or modify gid to sid mapping in idmap", "GID,SID" },
- { "remove-uid-mapping", 0, POPT_ARG_STRING, &string_arg, OPT_REMOVE_UID_MAPPING, "Remove uid to sid mapping in idmap", "UID,SID" },
- { "remove-gid-mapping", 0, POPT_ARG_STRING, &string_arg, OPT_REMOVE_GID_MAPPING, "Remove gid to sid mapping in idmap", "GID,SID" },
{ "check-secret", 't', POPT_ARG_NONE, 0, 't', "Check shared secret" },
{ "change-secret", 'c', POPT_ARG_NONE, 0, 'c', "Change shared secret" },
{ "ping-dc", 'P', POPT_ARG_NONE, 0, 'P',
@@ -2219,48 +2095,6 @@ int main(int argc, char **argv, char **envp)
goto done;
}
break;
- case OPT_SET_UID_MAPPING:
- if (!parse_mapping_arg(string_arg, &int_subarg,
- &string_subarg) ||
- !wbinfo_set_uid_mapping(int_subarg, string_subarg))
- {
- d_fprintf(stderr, "Could not create or modify "
- "uid to sid mapping\n");
- goto done;
- }
- break;
- case OPT_SET_GID_MAPPING:
- if (!parse_mapping_arg(string_arg, &int_subarg,
- &string_subarg) ||
- !wbinfo_set_gid_mapping(int_subarg, string_subarg))
- {
- d_fprintf(stderr, "Could not create or modify "
- "gid to sid mapping\n");
- goto done;
- }
- break;
- case OPT_REMOVE_UID_MAPPING:
- if (!parse_mapping_arg(string_arg, &int_subarg,
- &string_subarg) ||
- !wbinfo_remove_uid_mapping(int_subarg,
- string_subarg))
- {
- d_fprintf(stderr, "Could not remove uid to sid "
- "mapping\n");
- goto done;
- }
- break;
- case OPT_REMOVE_GID_MAPPING:
- if (!parse_mapping_arg(string_arg, &int_subarg,
- &string_subarg) ||
- !wbinfo_remove_gid_mapping(int_subarg,
- string_subarg))
- {
- d_fprintf(stderr, "Could not remove gid to sid "
- "mapping\n");
- goto done;
- }
- break;
case 't':
if (!wbinfo_check_secret(opt_domain_name)) {
d_fprintf(stderr, "Could not check secret\n");
diff --git a/source3/configure.in b/source3/configure.in
index f565fdb..dea167e 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6300,7 +6300,7 @@ else
LIBWBCLIENT_SHARED_TARGET=bin/libwbclient.$SHLIBEXT
LIBWBCLIENT_STATIC_TARGET=bin/libwbclient.a
- LIBWBCLIENT_SOVER=0
+ LIBWBCLIENT_SOVER=1
if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes" -a x"$BUILD_LIBWBCLIENT_SHARED" = x"yes"; then
NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}"
## Only worry about libwbclient if we have shared
diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index 8445d52..29b1a48 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -453,11 +453,11 @@ static WERROR regdb_store_regdb_version(uint32_t version)
status = dbwrap_trans_store_int32(regdb, version_keyname, version);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("regdb_init: error storing %s = %d: %s\n",
+ DEBUG(1, ("regdb_store_regdb_version: error storing %s = %d: %s\n",
version_keyname, version, nt_errstr(status)));
return ntstatus_to_werror(status);
} else {
- DEBUG(10, ("regdb_init: stored %s = %d\n",
+ DEBUG(10, ("regdb_store_regdb_version: stored %s = %d\n",
version_keyname, version));
return WERR_OK;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list