From: zacheiss <zacheiss>
Date: Wed, 2 May 2001 21:23:39 +0000 (+0000)
Subject: Don't return MRCL_*; they're not in com_err's number space.
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/aea5154c1ab060a27e4efb4f598a74119791de85

Don't return MRCL_*; they're not in com_err's number space.
---

diff --git a/incremental/winad/winad.c b/incremental/winad/winad.c
index 17d9d5da..00a9cf5a 100755
--- a/incremental/winad/winad.c
+++ b/incremental/winad/winad.c
@@ -2864,7 +2864,7 @@ int mr_connect_cl(char *server, char *client, int version, int auth)
   if (status)
     {
       com_err(whoami, status, "while connecting to Moira");
-      return MRCL_FAIL;
+      return status;
     }
 
   status = mr_motd(&motd);
@@ -2872,14 +2872,14 @@ int mr_connect_cl(char *server, char *client, int version, int auth)
     {
       mr_disconnect();
       com_err(whoami, status, "while checking server status");
-      return MRCL_FAIL;
+      return status;
     }
   if (motd)
     {
       sprintf(temp, "The Moira server is currently unavailable: %s", motd);
       com_err(whoami, status, temp);
       mr_disconnect();
-      return MRCL_FAIL;
+      return status;
     }
 
   status = mr_version(version);
@@ -2902,7 +2902,7 @@ int mr_connect_cl(char *server, char *client, int version, int auth)
         {
           com_err(whoami, status, "while setting query version number.");
           mr_disconnect();
-          return MRCL_FAIL;
+          return status;
         }
     }
 
@@ -2913,11 +2913,11 @@ int mr_connect_cl(char *server, char *client, int version, int auth)
         {
           com_err(whoami, status, "while authenticating to Moira.");
           mr_disconnect();
-          return MRCL_AUTH_ERROR;
+          return status;
         }
     }
 
-  return MRCL_SUCCESS;
+  return MR_SUCCESS;
 }
 
 void expand_groups(LDAP *ldap_handle, char *dn_path, char *group_name)