|
@@ -204,14 +204,14 @@ func (syncJob *SyncJob) SyncUsers(ldapClient *karmen_ldap.Client, karmenClient *
|
|
|
|
|
|
err = ldapClient.AddUser(user)
|
|
err = ldapClient.AddUser(user)
|
|
if err != nil {
|
|
if err != nil {
|
|
- return nil, err
|
|
|
|
|
|
+ return nil, fmt.Errorf("An error occurred for user %s: %v", user.CompleteName(), err)
|
|
}
|
|
}
|
|
|
|
|
|
if user.GetRegenerate() {
|
|
if user.GetRegenerate() {
|
|
if syncJob.conf.Sync.SendMail && user.GetAltEmail() != "" {
|
|
if syncJob.conf.Sync.SendMail && user.GetAltEmail() != "" {
|
|
err = syncJob.sendMail(user, mailTpl)
|
|
err = syncJob.sendMail(user, mailTpl)
|
|
if err != nil {
|
|
if err != nil {
|
|
- return nil, err
|
|
|
|
|
|
+ return nil, fmt.Errorf("An error occurred for user %s: %v", user.CompleteName(), err)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -219,7 +219,7 @@ func (syncJob *SyncJob) SyncUsers(ldapClient *karmen_ldap.Client, karmenClient *
|
|
|
|
|
|
err = karmenClient.UpdateUser(user)
|
|
err = karmenClient.UpdateUser(user)
|
|
if err != nil {
|
|
if err != nil {
|
|
- return nil, err
|
|
|
|
|
|
+ return nil, fmt.Errorf("An error occurred for user %s: %v", user.CompleteName(), err)
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
@@ -231,7 +231,7 @@ func (syncJob *SyncJob) SyncUsers(ldapClient *karmen_ldap.Client, karmenClient *
|
|
for _, entry := range result.Removed {
|
|
for _, entry := range result.Removed {
|
|
err := ldapClient.DeleteByDN(entry)
|
|
err := ldapClient.DeleteByDN(entry)
|
|
if err != nil {
|
|
if err != nil {
|
|
- return nil, err
|
|
|
|
|
|
+ return nil, fmt.Errorf("An error occurred for entry %s: %v", entry, err)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -241,7 +241,7 @@ func (syncJob *SyncJob) SyncUsers(ldapClient *karmen_ldap.Client, karmenClient *
|
|
if user.GetRegenerate() {
|
|
if user.GetRegenerate() {
|
|
password, err := password.Generate(8, 2, 0, false, true)
|
|
password, err := password.Generate(8, 2, 0, false, true)
|
|
if err != nil {
|
|
if err != nil {
|
|
- return nil, err
|
|
|
|
|
|
+ return nil, fmt.Errorf("An error occurred for user %s: %v", user.CompleteName(), err)
|
|
}
|
|
}
|
|
|
|
|
|
user.SetPlainPassword(password)
|
|
user.SetPlainPassword(password)
|
|
@@ -249,7 +249,7 @@ func (syncJob *SyncJob) SyncUsers(ldapClient *karmen_ldap.Client, karmenClient *
|
|
if syncJob.conf.Sync.SendMail && user.GetAltEmail() != "" {
|
|
if syncJob.conf.Sync.SendMail && user.GetAltEmail() != "" {
|
|
err = syncJob.sendMail(user, mailTpl)
|
|
err = syncJob.sendMail(user, mailTpl)
|
|
if err != nil {
|
|
if err != nil {
|
|
- return nil, err
|
|
|
|
|
|
+ return nil, fmt.Errorf("An error occurred for user %s: %v", user.CompleteName(), err)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -257,11 +257,11 @@ func (syncJob *SyncJob) SyncUsers(ldapClient *karmen_ldap.Client, karmenClient *
|
|
|
|
|
|
err = karmenClient.UpdateUser(user)
|
|
err = karmenClient.UpdateUser(user)
|
|
if err != nil {
|
|
if err != nil {
|
|
- return nil, err
|
|
|
|
|
|
+ return nil, fmt.Errorf("An error occurred for user %s: %v", user.CompleteName(), err)
|
|
}
|
|
}
|
|
err = ldapClient.UpdateUserPassword(user)
|
|
err = ldapClient.UpdateUserPassword(user)
|
|
if err != nil {
|
|
if err != nil {
|
|
- return nil, err
|
|
|
|
|
|
+ return nil, fmt.Errorf("An error occurred for user %s: %v", user.CompleteName(), err)
|
|
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|