summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraschrijver <aschrijver@cvs.openbsd.org>2008-10-06 11:20:21 +0000
committeraschrijver <aschrijver@cvs.openbsd.org>2008-10-06 11:20:21 +0000
commit012cbf5ff480ade2353f887fd48aac0a53380f23 (patch)
treefbe44850be35d4c96c1592af4385d605813a152d
parent6f5139fc20ddbc5d63363d79c128d6b617cb09f6 (diff)
Oops, also commit the header file. Remove silly debug message.
-rw-r--r--usr.sbin/ypldap/aldap.h18
-rw-r--r--usr.sbin/ypldap/ldapclient.c3
2 files changed, 10 insertions, 11 deletions
diff --git a/usr.sbin/ypldap/aldap.h b/usr.sbin/ypldap/aldap.h
index 0955123050b..d27feb76c5e 100644
--- a/usr.sbin/ypldap/aldap.h
+++ b/usr.sbin/ypldap/aldap.h
@@ -1,5 +1,5 @@
-/* $Id: aldap.h,v 1.2 2008/09/30 17:28:52 pyr Exp $ */
-/* $OpenBSD: aldap.h,v 1.2 2008/09/30 17:28:52 pyr Exp $ */
+/* $Id: aldap.h,v 1.3 2008/10/06 11:20:20 aschrijver Exp $ */
+/* $OpenBSD: aldap.h,v 1.3 2008/10/06 11:20:20 aschrijver Exp $ */
/*
* Copyright (c) 2008 Alexander Schrijver <aschrijver@openbsd.org>
@@ -59,14 +59,14 @@ enum aldap_protocol {
};
struct aldap_url {
- int protocol;
- char *host;
- int port;
- char *dn;
+ int protocol;
+ char *host;
+ in_port_t port;
+ char *dn;
#define MAXATTR 1024
- char *attributes[MAXATTR];
- int scope;
- char *filter;
+ char *attributes[MAXATTR];
+ int scope;
+ char *filter;
};
enum protocol_op {
diff --git a/usr.sbin/ypldap/ldapclient.c b/usr.sbin/ypldap/ldapclient.c
index e7550d7f6b3..1f812bc59ac 100644
--- a/usr.sbin/ypldap/ldapclient.c
+++ b/usr.sbin/ypldap/ldapclient.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ldapclient.c,v 1.3 2008/09/30 16:24:16 aschrijver Exp $ */
+/* $OpenBSD: ldapclient.c,v 1.4 2008/10/06 11:20:20 aschrijver Exp $ */
/*
* Copyright (c) 2008 Alexander Schrijver <aschrijver@openbsd.org>
@@ -419,7 +419,6 @@ client_try_idm(struct env *env, struct idm *idm)
return (0);
bad:
- printf("dusss\n");
log_debug("directory %s errored out in %s", idm->idm_name, where);
return (-1);
}