[GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.

[sfrench/samba-autobuild/.git] / source3 / libads / ads_status.c

diff --git a/source3/libads/ads_status.c b/source3/libads/ads_status.c
index 00427936aded818b7ebaa819af7cfdbe8dfa3da1..3f0ab576386e98b4617ca7fb064672a71e5b34bb 100644 (file)
--- a/source3/libads/ads_status.c
+++ b/source3/libads/ads_status.c
@@ -8,7 +8,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -76,14 +75,14 @@ NTSTATUS ads_ntstatus(ADS_STATUS status)
                return map_nt_error_from_unix(status.err.rc);
 #ifdef HAVE_LDAP
        case ENUM_ADS_ERROR_LDAP:
-               if (status.err.rc == LDAP_NO_MEMORY) {
-                       return NT_STATUS_NO_MEMORY;
+               if (status.err.rc == LDAP_SUCCESS) {
+                       return NT_STATUS_OK;
                }
-               break;
+               return NT_STATUS_LDAP(status.err.rc);
 #endif
 #ifdef HAVE_KRB5
        case ENUM_ADS_ERROR_KRB5:
-               return krb5_to_ntstatus(status.err.rc);
+               return krb5_to_nt_status(status.err.rc);
 #endif
        default:
                break;
@@ -141,7 +140,5 @@ const char *ads_errstr(ADS_STATUS status)
        default:
                return "Unknown ADS error type!? (not compiled in?)";
        }
-
 }
 
-