diff options
| author | Jeremy Allison <jra@samba.org> | 1998-11-16 19:25:54 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-11-16 19:25:54 +0000 |
| commit | 2aa66b03bbe1acec9ee42e22fc20d2e0790ae84c (patch) | |
| tree | f9aa9ea42e4212f625dc2e7ff7b84b4062eaa57c /source/include | |
| parent | 9daf4d9ba57e2a3d4bd023ddf8f9c0111fc1f873 (diff) | |
| download | samba-2aa66b03bbe1acec9ee42e22fc20d2e0790ae84c.tar.gz samba-2aa66b03bbe1acec9ee42e22fc20d2e0790ae84c.tar.xz samba-2aa66b03bbe1acec9ee42e22fc20d2e0790ae84c.zip | |
Added fixes from HEAD into 2.0 branch.
These are :
configure.in: Check for glob.h added.
libsmb/namequery.c: Fix for broken parsing of lmhosts.
smbd/reply.c:
smbd/trans2.c:
include/smb.h: Change ROUNDUP to SMB_ROUNDUP.
include/includes.h: Fixed include of glob.h
Jeremy.
Diffstat (limited to 'source/include')
| -rw-r--r-- | source/include/config.h.in | 3 | ||||
| -rw-r--r-- | source/include/includes.h | 2 | ||||
| -rw-r--r-- | source/include/smb.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/source/include/config.h.in b/source/include/config.h.in index 3f1df1f33b4..01bc2ee0d8d 100644 --- a/source/include/config.h.in +++ b/source/include/config.h.in @@ -594,6 +594,9 @@ /* Define if you have the <fcntl.h> header file. */ #undef HAVE_FCNTL_H +/* Define if you have the <glob.h> header file. */ +#undef HAVE_GLOB_H + /* Define if you have the <grp.h> header file. */ #undef HAVE_GRP_H diff --git a/source/include/includes.h b/source/include/includes.h index 274d3ccf249..fc718961a95 100644 --- a/source/include/includes.h +++ b/source/include/includes.h @@ -161,7 +161,7 @@ #endif #endif -#ifdef HAVE_GLOB +#ifdef HAVE_GLOB_H #include <glob.h> #endif diff --git a/source/include/smb.h b/source/include/smb.h index e94d45bf074..0f1683e3c92 100644 --- a/source/include/smb.h +++ b/source/include/smb.h @@ -1517,7 +1517,7 @@ enum ssl_version_enum {SMB_SSL_V2,SMB_SSL_V3,SMB_SSL_V23,SMB_SSL_TLS1}; /* this is how errors are generated */ #define UNIXERROR(defclass,deferror) unix_error_packet(inbuf,outbuf,defclass,deferror,__LINE__) -#define ROUNDUP(x,g) (((x)+((g)-1))&~((g)-1)) +#define SMB_ROUNDUP(x,g) (((x)+((g)-1))&~((g)-1)) /* * Global value meaing that the smb_uid field should be |