diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-02-19 12:31:16 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-02-19 12:31:16 +0000 |
| commit | 251ea1e6776401005e302addd56a689c01924426 (patch) | |
| tree | d36c5d4ffc7b2c77264e7f60aa52e8330835e1db /source3/include | |
| parent | 96cafdd7c735338da0616e0ad638282095f4c4d7 (diff) | |
| download | samba-251ea1e6776401005e302addd56a689c01924426.tar.gz samba-251ea1e6776401005e302addd56a689c01924426.tar.bz2 samba-251ea1e6776401005e302addd56a689c01924426.zip | |
Merge minor library fixes from HEAD to 3.0.
- setenv() replacement
- mimir's ASN1/SPNEGO typo fixes
- (size_t)-1 fixes for push_* returns
- function argument signed/unsigned correction
- ASN1 error handling (ensure we don't use initiailsed data)
- extra net ads join error checking
- allow 'set security discriptor' to fail
- escape ldap strings in libads.
- getgrouplist() correctness fixes (include primary gid)
Andrew Bartlett
(This used to be commit e9d6e2ea9a3dc01d3849b925c50702cda6ddf225)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/asn_1.h | 6 | ||||
| -rw-r--r-- | source3/include/includes.h | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/source3/include/asn_1.h b/source3/include/asn_1.h index 9cd873c18a..ab7fa5d398 100644 --- a/source3/include/asn_1.h +++ b/source3/include/asn_1.h @@ -55,8 +55,8 @@ typedef struct { #define OID_KERBEROS5_OLD "1 2 840 48018 1 2 2" #define OID_KERBEROS5 "1 2 840 113554 1 2 2" -#define SPNGEO_NEG_RESULT_ACCEPT 0 -#define SPNGEO_NEG_RESULT_INCOMPLETE 1 -#define SPNGEO_NEG_RESULT_REJECT 2 +#define SPNEGO_NEG_RESULT_ACCEPT 0 +#define SPNEGO_NEG_RESULT_INCOMPLETE 1 +#define SPNEGO_NEG_RESULT_REJECT 2 #endif /* _ASN_1_H */ diff --git a/source3/include/includes.h b/source3/include/includes.h index d48103cbe3..5aaf009738 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -962,6 +962,10 @@ size_t strnlen(const char *s, size_t n); unsigned long strtoul(const char *nptr, char **endptr, int base); #endif +#ifndef HAVE_SETENV +int setenv(const char *name, const char *value, int overwrite); +#endif + #if (defined(USE_SETRESUID) && !defined(HAVE_SETRESUID_DECL)) /* stupid glibc */ int setresuid(uid_t ruid, uid_t euid, uid_t suid); |