diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-23 18:04:16 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-23 18:04:16 +0200 |
| commit | d70efa57ceae1011a6a55d57d0152fd1bc2bb192 (patch) | |
| tree | 92ee7a3f33ea51f34a33fee094eaed651215a3d3 /source3/libsmb/nterr.c | |
| parent | 2f265feb174de1f743e8102ad34b3bdbcd2897cc (diff) | |
| parent | d805c714bb79a709716ec0373670283bfcd23c3c (diff) | |
| download | samba-d70efa57ceae1011a6a55d57d0152fd1bc2bb192.tar.gz samba-d70efa57ceae1011a6a55d57d0152fd1bc2bb192.tar.bz2 samba-d70efa57ceae1011a6a55d57d0152fd1bc2bb192.zip | |
Merge branch 'master' of git://git.samba.org/samba
Conflicts:
lib/util/asn1_proto.h
Diffstat (limited to 'source3/libsmb/nterr.c')
| -rw-r--r-- | source3/libsmb/nterr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/libsmb/nterr.c b/source3/libsmb/nterr.c index fc6340342f..1ba230cefe 100644 --- a/source3/libsmb/nterr.c +++ b/source3/libsmb/nterr.c @@ -653,7 +653,7 @@ const char *nt_errstr(NTSTATUS nt_code) char *result; #ifdef HAVE_LDAP - if (NT_STATUS_TYPE(nt_code) == NT_STATUS_TYPE_LDAP) { + if (NT_STATUS_IS_LDAP(nt_code)) { return ldap_err2string(NT_STATUS_LDAP_CODE(nt_code)); } #endif @@ -718,7 +718,7 @@ const char *get_nt_error_c_code(NTSTATUS nt_code) Returns the NT_STATUS constant matching the string supplied (as an NTSTATUS) *****************************************************************************/ -NTSTATUS nt_status_string_to_code(char *nt_status_str) +NTSTATUS nt_status_string_to_code(const char *nt_status_str) { int idx = 0; |