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

[samba.git] / source / libads / ads_status.c

diff --git a/source/libads/ads_status.c b/source/libads/ads_status.c
index 0e1a2d55d53aee094e1134099acc63f87bdb8a24..3f0ab576386e98b4617ca7fb064672a71e5b34bb 100644 (file)
--- a/source/libads/ads_status.c
+++ b/source/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"
@@ -84,10 +83,6 @@ NTSTATUS ads_ntstatus(ADS_STATUS status)
 #ifdef HAVE_KRB5
        case ENUM_ADS_ERROR_KRB5:
                return krb5_to_nt_status(status.err.rc);
-#endif
-#ifdef HAVE_GSSAPI
-       case ENUM_ADS_ERROR_GSS:
-               return map_nt_error_from_gss(status.err.rc, status.minor_status);
 #endif
        default:
                break;
@@ -147,12 +142,3 @@ const char *ads_errstr(ADS_STATUS status)
        }
 }
 
-#ifdef HAVE_GSSAPI
-NTSTATUS gss_err_to_ntstatus(OM_uint32 maj, OM_uint32 min)
-{
-       ADS_STATUS adss = ADS_ERROR_GSS(maj, min);
-       DEBUG(10,("gss_err_to_ntstatus: Error %s\n",
-               ads_errstr(adss) ));
-       return ads_ntstatus(adss);
-}
-#endif