starttls for autofs-ldap-auto-master.c (actually attaching it this time.)
PATCH 1/1 starttls for autofs-ldap-auto-master.c (actually attaching it this time.)
Grr. Don't you hate it when you do that?
Pi
Signature · 2 lines
Within C++, there is a much smaller and cleaner language struggling to get out. -- Bjarne Stroustrup
samples/autofs-ldap-auto-master.c +13 -1
@@ -160,6 +160,7 @@LDAP *ld =NULL ;int result;int c; +int starttls =1 ;/* By default, start TLS */ const char *map_key =MAPKEY , *entry_key =ENTRYKEY , *value =VALUE ;const char *map_oc =MAPOC , *entry_oc =ENTRYOC ;const char *map =MAP ;
@@ -167,7 +168,7 @@setlocale (LC_ALL ,"" );/* Scan through the argument list. */ -while ((c =getopt (argc, argv,"m:e:n:k:v:" )) !=-1 ) { +while ((c =getopt (argc, argv,"m:e:n:k:v:s" )) !=-1 ) {switch (c) {case 'm' :/* This is the object class we expect maps to
@@ -198,6 +199,10 @@* VALUE attribute. */ value = optarg;break ; +case 's' : +/* Disable starttls on the LDAP link */ + starttls =0 ; +break ;default :fprintf (stderr,"syntax: %s\n" "\t[-m %s] (map object class)\n"
@@ -205,6 +210,7 @@"\t[-n %s] (attribute used as map key)\n" "\t[-k %s] (attribute used as entry key)\n" "\t[-v %s] (attribute used as value)\n" +"\t[-s] (disable starttls)\n" "\t[%s] (map name)\n" ,strchr (argv[0 ],'/' ) ? strrchr(argv[0], '/') + 1 : argv[0],
@@ -235,6 +241,12 @@ ld =ldap_init (NULL ,LDAP_PORT ); } +if (starttls && (ldap_start_tls_s (ld,NULL ,NULL ) !=LDAP_SUCCESS )) { +/* Ooops. We failed to start TLS. Bomb out. */ +ldap_perror (ld,"Couldn't start TLS" ); +return 3 ; + } +/* Connect to the server anonymously. */ result =ldap_simple_bind_s (ld,NULL ,NULL );if (result !=LDAP_SUCCESS ) {
_______________________________________________
autofs mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/autofs
==> Regarding [autofs] [PATCH] starttls for autofs-ldap-auto-master.c (actually attaching it this time.); "Anthony M. Martinez" <[email protected]> adds:
twopir> Since our LDAP server is configured to require confidentiality, I made twopir> the program default to using it.
That's great for your environment, but breaks most everyone else. How about making this configurable and not changing the default? For Debian, I'm guessing the configuration would be stored in /etc/default/autofs. For Red Hat systems, it would use /etc/sysconfig/autofs.
-Jeff
Quoted 9 lines · Jeff Moyer
==> Regarding [autofs] [PATCH] starttls for
autofs-ldap-auto-master.c(actually attaching it this time.); "Anthony M. Martinez" <[email protected]> adds:twopir> Since our LDAP server is configured to require confidentiality, I made twopir> the program default to using it.
That's great for your environment, but breaks most everyone else. How about making this configurable and not changing the default? For Debian, I'm guessing the configuration would be stored in
/etc/default/autofs. For Red Hat systems, it would use/etc/sysconfig/autofs.
Okay. I modified the patch such that passing the -s option to autofs-ldap-auto-master will cause it to require confidentiality, otherwise it behaves normally.
I'll look at the distro-specific stuff later.
Pi
Quoted 7 lines
-Jeff
_______________________________________________
autofs mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/autofs
Signature · 3 lines
I have always wished that my computer would be as easy to use as my telephone. My wish has come true. I no longer know how to use my telephone. -- Bjarne Stroustrup
samples/autofs-ldap-auto-master.c +13 -1
@@ -160,6 +160,7 @@LDAP *ld =NULL ;int result;int c; +int starttls =0 ;/* By default, do not start TLS */ const char *map_key =MAPKEY , *entry_key =ENTRYKEY , *value =VALUE ;const char *map_oc =MAPOC , *entry_oc =ENTRYOC ;const char *map =MAP ;
@@ -167,7 +168,7 @@setlocale (LC_ALL ,"" );/* Scan through the argument list. */ -while ((c =getopt (argc, argv,"m:e:n:k:v:" )) !=-1 ) { +while ((c =getopt (argc, argv,"m:e:n:k:v:s" )) !=-1 ) {switch (c) {case 'm' :/* This is the object class we expect maps to
@@ -198,6 +199,10 @@* VALUE attribute. */ value = optarg;break ; +case 's' : +/* Enable starttls on the LDAP link */ + starttls =1 ; +break ;default :fprintf (stderr,"syntax: %s\n" "\t[-m %s] (map object class)\n"
@@ -205,6 +210,7 @@"\t[-n %s] (attribute used as map key)\n" "\t[-k %s] (attribute used as entry key)\n" "\t[-v %s] (attribute used as value)\n" +"\t[-s] (enable starttls)\n" "\t[%s] (map name)\n" ,strchr (argv[0 ],'/' ) ? strrchr(argv[0], '/') + 1 : argv[0],
@@ -235,6 +241,12 @@ ld =ldap_init (NULL ,LDAP_PORT ); } +if (starttls && (ldap_start_tls_s (ld,NULL ,NULL ) !=LDAP_SUCCESS )) { +/* Ooops. We failed to start TLS. Bomb out. */ +ldap_perror (ld,"Couldn't start TLS" ); +return 3 ; + } +/* Connect to the server anonymously. */ result =ldap_simple_bind_s (ld,NULL ,NULL );if (result !=LDAP_SUCCESS ) {
_______________________________________________
autofs mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/autofs