diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-22 05:14:14 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-22 05:14:14 +0200 |
| commit | c0e14d5021e738a9b89c73558c544596e2ad2000 (patch) | |
| tree | 1d4c5543f1b38eb8e1b05df87a34e8456826a8b3 /source4/nsswitch | |
| parent | 1d5beb7294d939504864c9b1203a5d7dcde7041a (diff) | |
| download | samba-c0e14d5021e738a9b89c73558c544596e2ad2000.tar.gz | |
Repel pstring to nsswitch/.
Diffstat (limited to 'source4/nsswitch')
| -rw-r--r-- | source4/nsswitch/wbinfo.c | 1 | ||||
| -rw-r--r-- | source4/nsswitch/winbind_nss_config.h | 11 | ||||
| -rw-r--r-- | source4/nsswitch/winbind_struct_protocol.h | 8 |
3 files changed, 8 insertions, 12 deletions
diff --git a/source4/nsswitch/wbinfo.c b/source4/nsswitch/wbinfo.c index 150d9a68ee1..a36a66b80f3 100644 --- a/source4/nsswitch/wbinfo.c +++ b/source4/nsswitch/wbinfo.c @@ -21,7 +21,6 @@ */ #include "includes.h" -#include "pstring.h" #include "winbind_client.h" #include "librpc/gen_ndr/ndr_netlogon.h" #include "libcli/auth/libcli_auth.h" diff --git a/source4/nsswitch/winbind_nss_config.h b/source4/nsswitch/winbind_nss_config.h index ba6153ec282..c5bc853770d 100644 --- a/source4/nsswitch/winbind_nss_config.h +++ b/source4/nsswitch/winbind_nss_config.h @@ -40,17 +40,6 @@ #include "nsswitch/winbind_nss.h" -/* 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 - /* Some systems (SCO) treat UNIX domain sockets as FIFOs */ #ifndef S_IFSOCK diff --git a/source4/nsswitch/winbind_struct_protocol.h b/source4/nsswitch/winbind_struct_protocol.h index fba45230a92..8003ea9585a 100644 --- a/source4/nsswitch/winbind_struct_protocol.h +++ b/source4/nsswitch/winbind_struct_protocol.h @@ -18,6 +18,14 @@ #ifndef _WINBINDD_NTDOM_H #define _WINBINDD_NTDOM_H +#define _PSTRING +#define FSTRING_LEN 256 + +typedef char fstring[FSTRING_LEN]; + +#define fstrcpy(d,s) safe_strcpy((d),(s),sizeof(fstring)-1) +#define fstrcat(d,s) safe_strcat((d),(s),sizeof(fstring)-1) + #define WINBINDD_SOCKET_NAME "pipe" /* Name of PF_UNIX socket */ /* Let the build environment override the public winbindd socket location. This |