diff options
| author | Gerald Carter <jerry@samba.org> | 2004-01-09 14:54:33 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2004-01-09 14:54:33 +0000 |
| commit | 500c28974ded4c4789d9f197de5860b20447e606 (patch) | |
| tree | 274387e7cc89a86faa742106bebcbb19b3006f0c /source3/libads | |
| parent | f1f24c7c6fbf6c55e807e1ddbc7e555744df3110 (diff) | |
| download | samba-500c28974ded4c4789d9f197de5860b20447e606.tar.gz samba-500c28974ded4c4789d9f197de5860b20447e606.tar.bz2 samba-500c28974ded4c4789d9f197de5860b20447e606.zip | |
fix some warnings from the Sun compiler
(This used to be commit ebabf72a78f0165521268b73e0fcabe1ea7834fd)
Diffstat (limited to 'source3/libads')
| -rw-r--r-- | source3/libads/ads_status.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source3/libads/ads_status.c b/source3/libads/ads_status.c index 63757af860..463f647f9c 100644 --- a/source3/libads/ads_status.c +++ b/source3/libads/ads_status.c @@ -31,10 +31,10 @@ ADS_STATUS ads_build_error(enum ads_error_type etype, { ADS_STATUS ret; - if (etype == ADS_ERROR_NT) { - DEBUG(0,("don't use ads_build_error with ADS_ERROR_NT!\n")); + if (etype == ENUM_ADS_ERROR_NT) { + DEBUG(0,("don't use ads_build_error with ENUM_ADS_ERROR_NT!\n")); ret.err.rc = -1; - ret.error_type = ADS_ERROR_SYSTEM; + ret.error_type = ENUM_ADS_ERROR_SYSTEM; ret.minor_status = 0; return ret; } @@ -50,10 +50,10 @@ ADS_STATUS ads_build_nt_error(enum ads_error_type etype, { ADS_STATUS ret; - if (etype != ADS_ERROR_NT) { - DEBUG(0,("don't use ads_build_nt_error without ADS_ERROR_NT!\n")); + if (etype != ENUM_ADS_ERROR_NT) { + DEBUG(0,("don't use ads_build_nt_error without ENUM_ADS_ERROR_NT!\n")); ret.err.rc = -1; - ret.error_type = ADS_ERROR_SYSTEM; + ret.error_type = ENUM_ADS_ERROR_SYSTEM; ret.minor_status = 0; return ret; } @@ -69,17 +69,17 @@ ADS_STATUS ads_build_nt_error(enum ads_error_type etype, */ NTSTATUS ads_ntstatus(ADS_STATUS status) { - if (status.error_type == ADS_ERROR_NT){ + if (status.error_type == ENUM_ADS_ERROR_NT){ return status.err.nt_status; } #ifdef HAVE_LDAP - if ((status.error_type == ADS_ERROR_LDAP) + if ((status.error_type == ENUM_ADS_ERROR_LDAP) && (status.err.rc == LDAP_NO_MEMORY)) { return NT_STATUS_NO_MEMORY; } #endif #ifdef HAVE_KRB5 - if (status.error_type = ADS_ERROR_KRB5) { + if (status.error_type == ENUM_ADS_ERROR_KRB5) { if (status.err.rc == KRB5KDC_ERR_PREAUTH_FAILED) { return NT_STATUS_LOGON_FAILURE; } else if (status.err.rc == KRB5_KDC_UNREACH) { @@ -103,18 +103,18 @@ const char *ads_errstr(ADS_STATUS status) msg_ctx = 0; switch (status.error_type) { - case ADS_ERROR_SYSTEM: + case ENUM_ADS_ERROR_SYSTEM: return strerror(status.err.rc); #ifdef HAVE_LDAP - case ADS_ERROR_LDAP: + case ENUM_ADS_ERROR_LDAP: return ldap_err2string(status.err.rc); #endif #ifdef HAVE_KRB5 - case ADS_ERROR_KRB5: + case ENUM_ADS_ERROR_KRB5: return error_message(status.err.rc); #endif #ifdef HAVE_GSSAPI - case ADS_ERROR_GSS: + case ENUM_ADS_ERROR_GSS: { uint32 minor; @@ -131,7 +131,7 @@ const char *ads_errstr(ADS_STATUS status) return ret; } #endif - case ADS_ERROR_NT: + case ENUM_ADS_ERROR_NT: return get_friendly_nt_error_msg(ads_ntstatus(status)); default: return "Unknown ADS error type!? (not compiled in?)"; |