[Samba4][PATCH] Updating the winbind protocol used in Samba4

Kai Blin kai at samba.org
Sat Jun 2 13:16:38 GMT 2007


On Saturday 02 June 2007 12:36:46 Stefan (metze) Metzmacher wrote:
> Kai Blin schrieb:
> > Hi folks,
> >
> > attached is my go at updating the samba4 winbind protocol to version 18.
> >
> > nsswitch/winbindd_nss.h is just copied from SAMBA_3_0.
> > nsswitch/winbind_nss_config.h is copied from SAMBA_3_0, too, but I had to
> > drop some of the defines to make things build again.
> >
> > Specifically, I had to drop the BOOL defines and I had to change the
> > socklen_t ifdef.
> >
> > The other changes are pretty obvious adaptions to the new winbind_request
> > and winbind_response structures.
>
> Hi Kai,
>
> If this complies and passes make test, please commit it,
> we can remove the remaining diff to samba3 as a next step....

See r23311.

The remaining diff is

--- -	2007-06-02 13:55:30.813194176 +0200
+++ /home/kai/samba/samba4/source/nsswitch/winbind_nss_config.h	2007-06-02 
13:54:50.000000000 +0200
@@ -53,6 +53,14 @@
 typedef char fstring[FSTRING_LEN];
 #endif
 
+#ifndef _UPPER_BOOL
+#define _UPPER_BOOL
+#define False (0)
+#define True (1)
+#define Auto (2)
+typedef int BOOL;
+#endif
+
 #if !defined(uint32)
 #if (SIZEOF_INT == 4)
 #define uint32 unsigned int

This one can be fixed by changing _UPPER_BOOL to BOOL_DEFINED, but I'm
not sure if that's a valid change.

@@ -105,10 +113,9 @@
 #define S_ISSOCK(mode)  ((mode & S_IFSOCK) == S_IFSOCK)
 #endif
 
-#ifndef HAVE_SOCKLEN_T
-#define HAVE_SOCKLEN_T
+#ifndef HAVE_SOCKLEN_T_TYPE
+#define HAVE_SOCKLEN_T_TYPE
 typedef int socklen_t;
 #endif

How do I fix this one? HAVE_SOCKLEN_T seems like the more standard
define for this, but samba3 uses HAVE_SOCKLEN_T_TYPE. Do I fix Samba3
or Samba4? :)

Cheers,
Kai

-- 
Kai Blin
WorldForge developer  http://www.worldforge.org/
Wine developer        http://wiki.winehq.org/KaiBlin
Samba team member     http://us1.samba.org/samba/team/
--
Will code for cotton.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.samba.org/archive/samba-technical/attachments/20070602/f15e66bb/attachment.bin


More information about the samba-technical mailing list