[1822] in Moira Commits
/svn/moira r3969 - trunk/moira/incremental/ldap
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Sun Jan 31 00:08:01 2010
Date: Sun, 31 Jan 2010 00:07:55 -0500
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201001310507.o0V57tq5013525@drugstore.mit.edu>
To: moira-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2010-01-31 00:07:55 -0500 (Sun, 31 Jan 2010)
New Revision: 3969
Modified:
trunk/moira/incremental/ldap/winad.c
Log:
From mark: fix segfault.
Modified: trunk/moira/incremental/ldap/winad.c
===================================================================
--- trunk/moira/incremental/ldap/winad.c 2010-01-27 23:00:11 UTC (rev 3968)
+++ trunk/moira/incremental/ldap/winad.c 2010-01-31 05:07:55 UTC (rev 3969)
@@ -574,7 +574,7 @@
char *DistinguishedName,
char *WinHomeDir, char *WinProfileDir,
char **homedir_v, char **winProfile_v,
- char **drives_v, LDAPMod **mods,
+ char **drives_v, char **apple_homedir_v, LDAPMod **mods,
int OpType, int n);
int sid_update(LDAP *ldap_handle, char *dn_path);
void SwitchSFU(LDAPMod **mods, int *UseSFU30, int n);
@@ -4122,6 +4122,7 @@
char *uid_v[] = {NULL, NULL};
char *mitid_v[] = {NULL, NULL};
char *homedir_v[] = {NULL, NULL};
+ char *apple_homedir_v[] = {NULL, NULL};
char *winProfile_v[] = {NULL, NULL};
char *drives_v[] = {NULL, NULL};
char *userAccountControl_v[] = {NULL, NULL};
@@ -4710,7 +4711,7 @@
n = SetHomeDirectory(ldap_handle, user_name, distinguished_name, WinHomeDir,
WinProfileDir, homedir_v, winProfile_v,
- drives_v, mods, LDAP_MOD_REPLACE, n);
+ drives_v, apple_homedir_v, mods, LDAP_MOD_REPLACE, n);
if(ActiveDirectory)
{
@@ -4983,6 +4984,7 @@
char *gid_v[] = {NULL, NULL};
char *mitid_v[] = {NULL, NULL};
char *homedir_v[] = {NULL, NULL};
+ char *apple_homedir_v[] = {NULL, NULL};
char *winProfile_v[] = {NULL, NULL};
char *drives_v[] = {NULL, NULL};
char *mail_v[] = {NULL, NULL};
@@ -5351,7 +5353,7 @@
n = SetHomeDirectory((LDAP *)call_args[0], user_name, new_dn,
WinHomeDir, WinProfileDir, homedir_v, winProfile_v,
- drives_v, mods, LDAP_MOD_ADD, n);
+ drives_v, apple_homedir_v, mods, LDAP_MOD_ADD, n);
if(ActiveDirectory)
{
@@ -8400,7 +8402,7 @@
char *DistinguishedName,
char *WinHomeDir, char *WinProfileDir,
char **homedir_v, char **winProfile_v,
- char **drives_v, LDAPMod **mods,
+ char **drives_v, char **apple_homedir_v, LDAPMod **mods,
int OpType, int n)
{
char cWeight[3];
@@ -8411,7 +8413,6 @@
char homeDrive[8];
char homedir[1024];
char apple_homedir[1024];
- char *apple_homedir_v[] = {NULL, NULL};
int last_weight;
int i;
int rc;
@@ -8432,7 +8433,7 @@
critical_alert(whoami, "Ldap incremental",
"Error contacting Moira server : %s",
error_message(rc));
- return;
+ return(n);
}
argv[0] = user_name;
@@ -8503,7 +8504,7 @@
critical_alert(whoami, "Ldap incremental",
"Error contacting Moira server : %s",
error_message(rc));
- return;
+ return(n);
}
argv[0] = user_name;
