---------------------
PatchSet 4011 
Date: 2007/01/25 08:48:12
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
syncing with HEAD

Members: 
	helpers/ntlm_auth/winbind/patches/.cvsignore:1.1->1.1.14.1(DEAD) 
	include/samba/.cvsignore:1.1->1.1.14.1(DEAD) 
	include/samba/README.txt:1.1->1.1.12.1(DEAD) 
	include/samba/nsswitch/.cvsignore:1.1->1.1.14.1(DEAD) 
	include/samba/nsswitch/sys_nss.h:1.1->1.1.12.1(DEAD) 
	include/samba/nsswitch/winbind_nss_config.h:1.1->1.1.12.1(DEAD) 
	include/samba/nsswitch/winbindd_nss.h:1.1->1.1.12.1(DEAD) 

--- squid3/helpers/ntlm_auth/winbind/patches/.cvsignore	Wed Feb 14 13:38:35 2007
+++ /dev/null	Wed Feb 14 13:37:19 2007
@@ -1,2 +0,0 @@
-.cvsignore
-Makefile.in
--- squid3/include/samba/.cvsignore	Wed Feb 14 13:38:35 2007
+++ /dev/null	Wed Feb 14 13:37:19 2007
@@ -1,2 +0,0 @@
-.cvsignore
-Makefile.in
--- squid3/include/samba/README.txt	Wed Feb 14 13:38:35 2007
+++ /dev/null	Wed Feb 14 13:37:19 2007
@@ -1,7 +0,0 @@
-These files are copies of Samba internal headers from Samba-2.2.7a
-required by the winbind helpers to Squid.
-
-If you compile the winbind helpers with other versions of Samba you may
-need to copy the relevant headers from the Samba version you are using
-here, or use the --with-samba-source=... configure option to tell Squid
-where the Samba sources can be found.
--- squid3/include/samba/nsswitch/.cvsignore	Wed Feb 14 13:38:35 2007
+++ /dev/null	Wed Feb 14 13:37:19 2007
@@ -1,2 +0,0 @@
-.cvsignore
-Makefile.in
--- squid3/include/samba/nsswitch/sys_nss.h	Wed Feb 14 13:38:35 2007
+++ /dev/null	Wed Feb 14 13:37:19 2007
@@ -1,104 +0,0 @@
-#ifndef _NSSWITCH_SYS_NSS_H
-#define _NSSWITCH_SYS_NSS_H
-/* 
-   Unix SMB/CIFS implementation.
-
-   a common place to work out how to define NSS_STATUS on various
-   platforms
-
-   Copyright (C) Tim Potter 2000
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library 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
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA  02111-1307, USA.   
-*/
-
-#ifdef HAVE_NSS_COMMON_H
-
-/* Sun Solaris */
-
-#include <nss_common.h>
-#include <nss_dbdefs.h>
-#include <nsswitch.h>
-
-typedef nss_status_t NSS_STATUS;
-
-#define NSS_STATUS_SUCCESS     NSS_SUCCESS
-#define NSS_STATUS_NOTFOUND    NSS_NOTFOUND
-#define NSS_STATUS_UNAVAIL     NSS_UNAVAIL
-#define NSS_STATUS_TRYAGAIN    NSS_TRYAGAIN
-
-#elif HAVE_NSS_H
-
-/* GNU */
-
-#include <nss.h>
-
-typedef enum nss_status NSS_STATUS;
-
-#elif HAVE_NS_API_H
-
-/* SGI IRIX */
-
-/* following required to prevent warnings of double definition
- * of datum from ns_api.h
-*/
-#ifdef DATUM
-#define _DATUM_DEFINED
-#endif
-
-#include <ns_api.h>
-
-typedef enum
-{
-  NSS_STATUS_SUCCESS=NS_SUCCESS,
-  NSS_STATUS_NOTFOUND=NS_NOTFOUND,
-  NSS_STATUS_UNAVAIL=NS_UNAVAIL,
-  NSS_STATUS_TRYAGAIN=NS_TRYAGAIN
-} NSS_STATUS;
-
-#define NSD_MEM_STATIC 0
-#define NSD_MEM_VOLATILE 1
-#define NSD_MEM_DYNAMIC 2
-
-#elif defined(HPUX) && defined(HAVE_NSSWITCH_H)
-/* HP-UX 11 */
-
-#include "nsswitch/hp_nss_common.h"
-#include "nsswitch/hp_nss_dbdefs.h"
-#include <nsswitch.h>
-
-#ifndef _HAVE_TYPEDEF_NSS_STATUS
-#define _HAVE_TYPEDEF_NSS_STATUS
-typedef nss_status_t NSS_STATUS;
-
-#define NSS_STATUS_SUCCESS     NSS_SUCCESS
-#define NSS_STATUS_NOTFOUND    NSS_NOTFOUND
-#define NSS_STATUS_UNAVAIL     NSS_UNAVAIL
-#define NSS_STATUS_TRYAGAIN    NSS_TRYAGAIN
-#endif /* HPUX */
-
-#else /* Nothing's defined. Neither gnu nor sun nor hp */
-
-typedef enum
-{
-  NSS_STATUS_SUCCESS=0,
-  NSS_STATUS_NOTFOUND=1,
-  NSS_STATUS_UNAVAIL=2,
-  NSS_STATUS_TRYAGAIN=3
-} NSS_STATUS;
-
-#endif
-
-#endif /* _NSSWITCH_SYS_NSS_H */
--- squid3/include/samba/nsswitch/winbind_nss_config.h	Wed Feb 14 13:38:35 2007
+++ /dev/null	Wed Feb 14 13:37:19 2007
@@ -1,155 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   Winbind daemon for ntdom nss module
-
-   Copyright (C) Tim Potter 2000
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library 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
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA  02111-1307, USA.   
-*/
-
-#ifndef _WINBIND_NSS_CONFIG_H
-#define _WINBIND_NSS_CONFIG_H
-
-/* Include header files from data in config.h file */
-
-#include <config.h>
-
-#include <stdio.h>
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
-#ifdef HAVE_UNIXSOCKET
-#include <sys/un.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#ifdef HAVE_GRP_H
-#include <grp.h>
-#endif
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <pwd.h>
-#include "nsswitch/sys_nss.h"
-
-/* Declarations for functions in winbind_nss.c
-   needed in winbind_nss_solaris.c (solaris wrapper to nss) */
-
-NSS_STATUS _nss_winbind_setpwent(void);
-NSS_STATUS _nss_winbind_endpwent(void);
-NSS_STATUS _nss_winbind_getpwent_r(struct passwd* result, char* buffer,
-				   size_t buflen, int* errnop);
-NSS_STATUS _nss_winbind_getpwuid_r(uid_t, struct passwd*, char* buffer,
-				   size_t buflen, int* errnop);
-NSS_STATUS _nss_winbind_getpwnam_r(const char* name, struct passwd* result,
-				   char* buffer, size_t buflen, int* errnop);
-
-NSS_STATUS _nss_winbind_setgrent(void);
-NSS_STATUS _nss_winbind_endgrent(void);
-NSS_STATUS _nss_winbind_getgrent_r(struct group* result, char* buffer,
-				   size_t buflen, int* errnop);
-NSS_STATUS _nss_winbind_getgrnam_r(const char *name,
-				   struct group *result, char *buffer,
-				   size_t buflen, int *errnop);
-NSS_STATUS _nss_winbind_getgrgid_r(gid_t gid,
-				   struct group *result, char *buffer,
-				   size_t buflen, int *errnop);
-
-/* I'm trying really hard not to include anything from smb.h with the
-   result of some silly looking redeclaration of structures. */
-
-#ifndef _PSTRING
-#define _PSTRING
-#define PSTRING_LEN 1024
-#define FSTRING_LEN 256
-typedef char pstring[PSTRING_LEN];
-typedef char fstring[FSTRING_LEN];
-#endif
-
-#ifndef _BOOL
-#define _BOOL			/* So we don't typedef BOOL again in vfs.h */
-#define False (0)
-#define True (1)
-#define Auto (2)
-typedef int BOOL;
-#endif
-
-#if !defined(uint32)
-#if (SIZEOF_INT == 4)
-#define uint32 unsigned int
-#elif (SIZEOF_LONG == 4)
-#define uint32 unsigned long
-#elif (SIZEOF_SHORT == 4)
-#define uint32 unsigned short
-#endif
-#endif
-
-#if !defined(uint16)
-#if (SIZEOF_SHORT == 4)
-#define uint16 __ERROR___CANNOT_DETERMINE_TYPE_FOR_INT16;
-#else /* SIZEOF_SHORT != 4 */
-#define uint16 unsigned short
-#endif /* SIZEOF_SHORT != 4 */
-#endif
-
-#ifndef uint8
-#define uint8 unsigned char
-#endif
-
-/* zero a structure */
-#ifndef ZERO_STRUCT
-#define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x))
-#endif
-
-/* zero a structure given a pointer to the structure */
-#ifndef ZERO_STRUCTP
-#define ZERO_STRUCTP(x) { if ((x) != NULL) memset((char *)(x), 0, sizeof(*(x))); }
-#endif
-
-/* Some systems (SCO) treat UNIX domain sockets as FIFOs */
-
-#ifndef S_IFSOCK
-#define S_IFSOCK S_IFIFO
-#endif
-
-#ifndef S_ISSOCK
-#define S_ISSOCK(mode)  ((mode & S_IFSOCK) == S_IFSOCK)
-#endif
-
-#endif
--- squid3/include/samba/nsswitch/winbindd_nss.h	Wed Feb 14 13:38:35 2007
+++ /dev/null	Wed Feb 14 13:37:19 2007
@@ -1,229 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   Winbind daemon for ntdom nss module
-
-   Copyright (C) Tim Potter 2000
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library 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
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA  02111-1307, USA.   
-*/
-
-#ifndef SAFE_FREE
-#define SAFE_FREE(x) do { if(x) {free(x); x=NULL;} } while(0)
-#endif
-
-#ifndef _WINBINDD_NTDOM_H
-#define _WINBINDD_NTDOM_H
-
-#define WINBINDD_SOCKET_NAME "pipe"            /* Name of PF_UNIX socket */
-#define WINBINDD_SOCKET_DIR  "/tmp/.winbindd"  /* Name of PF_UNIX dir */
-
-#define WINBINDD_DOMAIN_ENV  "WINBINDD_DOMAIN" /* Environment variables */
-#define WINBINDD_DONT_ENV    "_NO_WINBINDD"
-
-/* Update this when you change the interface.  */
-
-#define WINBIND_INTERFACE_VERSION 4
-
-/* Socket commands */
-
-enum winbindd_cmd {
-
-	WINBINDD_INTERFACE_VERSION,    /* Always a well known value */
-
-	/* Get users and groups */
-
-	WINBINDD_GETPWNAM,
-	WINBINDD_GETPWUID,
-	WINBINDD_GETGRNAM,
-	WINBINDD_GETGRGID,
-	WINBINDD_GETGROUPS,
-
-	/* Enumerate users and groups */
-
-	WINBINDD_SETPWENT,
-	WINBINDD_ENDPWENT,
-	WINBINDD_GETPWENT,
-	WINBINDD_SETGRENT,
-	WINBINDD_ENDGRENT,
-	WINBINDD_GETGRENT,
-
-	/* PAM authenticate and password change */
-
-	WINBINDD_PAM_AUTH,
-	WINBINDD_PAM_AUTH_CRAP,
-	WINBINDD_PAM_CHAUTHTOK,
-
-	/* List various things */
-
-	WINBINDD_LIST_USERS,         /* List w/o rid->id mapping */
-	WINBINDD_LIST_GROUPS,        /* Ditto */
-	WINBINDD_LIST_TRUSTDOM,
-
-	/* SID conversion */
-
-	WINBINDD_LOOKUPSID,
-	WINBINDD_LOOKUPNAME,
-
-	/* Lookup functions */
-
-	WINBINDD_SID_TO_UID,       
-	WINBINDD_SID_TO_GID,
-	WINBINDD_UID_TO_SID,
-	WINBINDD_GID_TO_SID,
-
-	/* Miscellaneous other stuff */
-
-	WINBINDD_CHECK_MACHACC,     /* Check machine account pw works */
-	WINBINDD_PING,              /* Just tell me winbind is running */
-	WINBINDD_INFO,              /* Various bit of info.  Currently just tidbits */
-	WINBINDD_DOMAIN_NAME,       /* The domain this winbind server is a member of (lp_workgroup()) */
-
-	WINBINDD_SHOW_SEQUENCE, /* display sequence numbers of domains */
-
-	/* WINS commands */
-
-	WINBINDD_WINS_BYIP,
-	WINBINDD_WINS_BYNAME,
-
-	/* Placeholder for end of cmd list */
-
-	WINBINDD_NUM_CMDS
-};
-
-/* Winbind request structure */
-
-struct winbindd_request {
-	uint32 length;
-	enum winbindd_cmd cmd;   /* Winbindd command to execute */
-	pid_t pid;               /* pid of calling process */
-
-	union {
-		fstring winsreq;     /* WINS request */
-		fstring username;    /* getpwnam */
-		fstring groupname;   /* getgrnam */
-		uid_t uid;           /* getpwuid, uid_to_sid */
-		gid_t gid;           /* getgrgid, gid_to_sid */
-		struct {
-			/* We deliberatedly don't split into domain/user to
-                           avoid having the client know what the separator
-                           character is. */	
-			fstring user;
-			fstring pass;
-		} auth;              /* pam_winbind auth module */
-                struct {
-                        unsigned char chal[8];
-                        fstring user;
-                        fstring domain;
-                        fstring lm_resp;
-                        uint16 lm_resp_len;
-                        fstring nt_resp;
-                        uint16 nt_resp_len;
-                } auth_crap;
-                struct {
-                    fstring user;
-                    fstring oldpass;
-                    fstring newpass;
-                } chauthtok;         /* pam_winbind passwd module */
-		fstring sid;         /* lookupsid, sid_to_[ug]id */
-		struct {
-			fstring dom_name;       /* lookupname */
-			fstring name;       
-		} name;
-		uint32 num_entries;  /* getpwent, getgrent */
-	} data;
-	fstring domain;      /* {set,get,end}{pw,gr}ent() */
-};
-
-/* Response values */
-
-enum winbindd_result {
-	WINBINDD_ERROR,
-	WINBINDD_OK
-};
-
-/* Winbind response structure */
-
-struct winbindd_response {
-    
-	/* Header information */
-
-	uint32 length;                        /* Length of response */
-	enum winbindd_result result;          /* Result code */
-
-	/* Fixed length return data */
-	
-	union {
-		int interface_version;  /* Try to ensure this is always in the same spot... */
-		
-		fstring winsresp;		/* WINS response */
-
-		/* getpwnam, getpwuid */
-		
-		struct winbindd_pw {
-			fstring pw_name;
-			fstring pw_passwd;
-			uid_t pw_uid;
-			gid_t pw_gid;
-			fstring pw_gecos;
-			fstring pw_dir;
-			fstring pw_shell;
-		} pw;
-
-		/* getgrnam, getgrgid */
-
-		struct winbindd_gr {
-			fstring gr_name;
-			fstring gr_passwd;
-			gid_t gr_gid;
-			int num_gr_mem;
-			int gr_mem_ofs;   /* offset to group membership */
-		} gr;
-
-		uint32 num_entries; /* getpwent, getgrent */
-		struct winbindd_sid {
-			fstring sid;        /* lookupname, [ug]id_to_sid */
-			int type;
-		} sid;
-		struct winbindd_name {
-			fstring dom_name;       /* lookupsid */
-			fstring name;       
-			int type;
-		} name;
-		uid_t uid;          /* sid_to_uid */
-		gid_t gid;          /* sid_to_gid */
-		struct winbindd_info {
-			char winbind_separator;
-			fstring samba_version;
-		} info;
-		fstring domain_name;
-
-		struct auth_reply {
-			uint32 nt_status;
-			fstring nt_status_string;
-			fstring error_string;
-			int pam_error;
-		} auth;
-	} data;
-
-	uint32 nt_status;	/* Extended error information */
-
-	/* Variable length return data */
-
-	void *extra_data;               /* getgrnam, getgrgid, getgrent */
-};
-
-#endif
