| ypldap.c (292270) | ypldap.c (299884) |
|---|---|
| 1/* $OpenBSD: ypldap.c,v 1.16 2015/11/02 10:06:06 jmatthew Exp $ */ 2/* $FreeBSD */ 3 4/* 5 * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> 6 * 7 * Permission to use, copy, modify, and distribute this software for any 8 * purpose with or without fee is hereby granted, provided that the above --- 229 unchanged lines hidden (view full) --- 238 bp = cp; 239 for (;;) { 240 if (!(cp = strsep(&bp, ","))) 241 break; 242 ukey.ue_line = cp; 243 if ((ue = RB_FIND(user_name_tree, env->sc_user_names_t, 244 &ukey)) == NULL) { 245 /* User not found */ | 1/* $OpenBSD: ypldap.c,v 1.16 2015/11/02 10:06:06 jmatthew Exp $ */ 2/* $FreeBSD */ 3 4/* 5 * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> 6 * 7 * Permission to use, copy, modify, and distribute this software for any 8 * purpose with or without fee is hereby granted, provided that the above --- 229 unchanged lines hidden (view full) --- 238 bp = cp; 239 for (;;) { 240 if (!(cp = strsep(&bp, ","))) 241 break; 242 ukey.ue_line = cp; 243 if ((ue = RB_FIND(user_name_tree, env->sc_user_names_t, 244 &ukey)) == NULL) { 245 /* User not found */ |
| 246 log_warnx("main: user: %s is referenced as a " 247 "group member, but can't be found in the " 248 "users map.\n", ukey.ue_line); | 246 log_warnx("main: unknown user %s in group %s\n", 247 ukey.ue_line, ge->ge_line); |
| 249 if (bp != NULL) 250 *(bp-1) = ','; 251 continue; 252 } 253 if (bp != NULL) 254 *(bp-1) = ','; 255 256 /* Make sure the new group doesn't equal to the main gid */ --- 395 unchanged lines hidden --- | 248 if (bp != NULL) 249 *(bp-1) = ','; 250 continue; 251 } 252 if (bp != NULL) 253 *(bp-1) = ','; 254 255 /* Make sure the new group doesn't equal to the main gid */ --- 395 unchanged lines hidden --- |