[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  4125ff89e44 lib/winbind_util: Add winbind_xid_to_sid for --without-winbind
       via  73bac6f9af6 lib/winbind_util: Remove winbind_[gu]id_to_sid
       via  4b1e4c22128 lib/winbind_util: Move include out of ifdef
      from  1d5583c9131 dns_hub: Add some debug as to what DNS proxying is happening

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4125ff89e44a3e98882cfc38c06e559a6e1e56a5
Author: Christof Schmitt <cs at samba.org>
Date:   Tue Mar 5 11:56:49 2019 -0700

    lib/winbind_util: Add winbind_xid_to_sid for --without-winbind
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13813
    
    Signed-off-by: Christof Schmitt <cs at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Mar  6 01:53:16 UTC 2019 on sn-devel-144

commit 73bac6f9af66f3914f049621ce3caae528e2730f
Author: Christof Schmitt <cs at samba.org>
Date:   Tue Mar 5 11:52:38 2019 -0700

    lib/winbind_util: Remove winbind_[gu]id_to_sid
    
    Commit c906153cc7 removed these functions, now also remove them for the
    --without-winbind case.
    
    Signed-off-by: Christof Schmitt <cs at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 4b1e4c22128bdefe549a58b181e9b755854f4c3e
Author: Christof Schmitt <cs at samba.org>
Date:   Tue Mar 5 11:50:48 2019 -0700

    lib/winbind_util: Move include out of ifdef
    
    This fixes compile errors about missing prototypes with
    --picky-developer and --without-winbind
    
    Signed-off-by: Christof Schmitt <cs at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/winbind_util.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/winbind_util.c b/source3/lib/winbind_util.c
index fe35a6f78d1..7e3f8ab9eb8 100644
--- a/source3/lib/winbind_util.c
+++ b/source3/lib/winbind_util.c
@@ -23,10 +23,10 @@
 #include "../lib/util/util_pw.h"
 #include "nsswitch/libwbclient/wbclient.h"
 
-#if defined(WITH_WINBIND)
-
 #include "lib/winbind_util.h"
 
+#if defined(WITH_WINBIND)
+
 struct passwd * winbind_getpwnam(const char * name)
 {
 	wbcErr result;
@@ -346,13 +346,6 @@ bool winbind_sid_to_uid(uid_t *puid, const struct dom_sid *sid)
 	return false;
 }
 
-/* Call winbindd to convert uid to sid */
-
-bool winbind_uid_to_sid(struct dom_sid *sid, uid_t uid)
-{
-	return false;
-}
-
 /* Call winbindd to convert SID to gid */
 
 bool winbind_sid_to_gid(gid_t *pgid, const struct dom_sid *sid)
@@ -360,9 +353,9 @@ bool winbind_sid_to_gid(gid_t *pgid, const struct dom_sid *sid)
 	return false;
 }
 
-/* Call winbindd to convert gid to sid */
+/* Call winbindd to convert uid or gid to SID */
 
-bool winbind_gid_to_sid(struct dom_sid *sid, gid_t gid)
+bool winbind_xid_to_sid(struct dom_sid *sid, const struct unixid *xid)
 {
 	return false;
 }


-- 
Samba Shared Repository