[1782] in Moira
winad.c change
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Wed May 2 02:09:58 2001
Message-Id: <200105020609.CAA15090@hodge-podge.mit.edu>
To: moiradev@MIT.EDU
Date: Wed, 02 May 2001 02:09:49 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
I noticed this evening when a winad incremental failed (see
upcoming mail) that the zephyr was the lovely and nonsensical:
May 2 01:30:20 <28944>Moira error retrieving grouplist of user jwu@hearst.com : No such device or address
because mr_connect_cl() was returning MRCL_AUTH_ERROR, which isn't an
error code in the com_err number space. Blech. This patch should fix
it.
Garry
Index: winad.c
===================================================================
RCS file: /afs/athena.mit.edu/astaff/project/moiradev/repository/moira/incremental/winad/winad.c,v
retrieving revision 1.9
diff -u -r1.9 winad.c
--- winad.c 2001/04/30 19:49:56 1.9
+++ winad.c 2001/05/02 06:02:39
@@ -2864,7 +2864,7 @@
if (status)
{
com_err(whoami, status, "while connecting to Moira");
- return MRCL_FAIL;
+ return status;
}
status = mr_motd(&motd);
@@ -2872,14 +2872,14 @@
{
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 @@
{
com_err(whoami, status, "while setting query version number.");
mr_disconnect();
- return MRCL_FAIL;
+ return status;
}
}
@@ -2913,11 +2913,11 @@
{
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)
