Deleted Added
full compact
ypldap.h (290931) ypldap.h (290935)
1/* $OpenBSD: ypldap.h,v 1.16 2015/01/16 06:40:22 deraadt Exp $ */
1/* $OpenBSD: ypldap.h,v 1.16 2015/01/16 06:40:22 deraadt Exp $ */
2/* $FreeBSD: head/usr.sbin/ypldap/ypldap.h 290931 2015-11-16 16:48:43Z rodrigc $ */
2/* $FreeBSD: head/usr.sbin/ypldap/ypldap.h 290935 2015-11-16 17:02:34Z rodrigc $ */
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
9 * copyright notice and this permission notice appear in all copies.
10 *

--- 66 unchanged lines hidden (view full) ---

77};
78
79/*
80 * beck, djm, dlg: pay attention to the struct name
81 */
82struct idm {
83 TAILQ_ENTRY(idm) idm_entry;
84 u_int32_t idm_id;
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
9 * copyright notice and this permission notice appear in all copies.
10 *

--- 66 unchanged lines hidden (view full) ---

77};
78
79/*
80 * beck, djm, dlg: pay attention to the struct name
81 */
82struct idm {
83 TAILQ_ENTRY(idm) idm_entry;
84 u_int32_t idm_id;
85 char idm_name[HOST_NAME_MAX+1];
85 char idm_name[MAXHOSTNAMELEN];
86#define F_SSL 0x00100000
87#define F_CONFIGURING 0x00200000
88#define F_NEEDAUTH 0x00400000
89#define F_FIXED_ATTR(n) (1<<n)
90#define F_LIST(n) (1<<n)
91 enum client_state idm_state;
92 u_int32_t idm_flags; /* lower 20 reserved */
93 u_int32_t idm_list;

--- 57 unchanged lines hidden (view full) ---

151#define YPMAP_MASTER_PASSWD_BYUID 0x00000008
152#define YPMAP_GROUP_BYNAME 0x00000010
153#define YPMAP_GROUP_BYGID 0x00000020
154#define YPMAP_NETID_BYNAME 0x00000040
155 u_int32_t sc_flags;
156
157 u_int32_t sc_maxid;
158
86#define F_SSL 0x00100000
87#define F_CONFIGURING 0x00200000
88#define F_NEEDAUTH 0x00400000
89#define F_FIXED_ATTR(n) (1<<n)
90#define F_LIST(n) (1<<n)
91 enum client_state idm_state;
92 u_int32_t idm_flags; /* lower 20 reserved */
93 u_int32_t idm_list;

--- 57 unchanged lines hidden (view full) ---

151#define YPMAP_MASTER_PASSWD_BYUID 0x00000008
152#define YPMAP_GROUP_BYNAME 0x00000010
153#define YPMAP_GROUP_BYGID 0x00000020
154#define YPMAP_NETID_BYNAME 0x00000040
155 u_int32_t sc_flags;
156
157 u_int32_t sc_maxid;
158
159 char sc_domainname[HOST_NAME_MAX+1];
159 char sc_domainname[MAXHOSTNAMELEN];
160 struct timeval sc_conf_tv;
161 struct event sc_conf_ev;
162 TAILQ_HEAD(idm_list, idm) sc_idms;
163 struct imsgev *sc_iev;
164 struct imsgev *sc_iev_dns;
165
166 RB_HEAD(user_name_tree,userent) *sc_user_names;
167 RB_HEAD(user_uid_tree,userent) sc_user_uids;

--- 55 unchanged lines hidden ---
160 struct timeval sc_conf_tv;
161 struct event sc_conf_ev;
162 TAILQ_HEAD(idm_list, idm) sc_idms;
163 struct imsgev *sc_iev;
164 struct imsgev *sc_iev_dns;
165
166 RB_HEAD(user_name_tree,userent) *sc_user_names;
167 RB_HEAD(user_uid_tree,userent) sc_user_uids;

--- 55 unchanged lines hidden ---