#This patch was developed both in-house and from outside. We plan to submit it

#upstream, but do not yet have a target date for doing so

#

# HG changeset patch

# Parent  de0231b8e245553d9dd1f37e46202e96ba6e6e70

diff -r de0231b8e245 Makefile.am

--- a/Makefile.am	Tue Feb 23 22:30:48 2016 -0800

+++ b/Makefile.am	Tue Feb 23 22:30:49 2016 -0800

@@ -7,9 +7,9 @@

 install-data-hook:

 	if test -e $(DESTDIR)$(sysconfdir)/libsdp.conf; then \

-		diff -q $(srcdir)/libsdp.conf $(DESTDIR)$(sysconfdir)/libsdp.conf 1> /dev/null; \

+		diff $(srcdir)/libsdp.conf $(DESTDIR)$(sysconfdir)/libsdp.conf 1> /dev/null; \

 		if test $$? == 1; then \

-			t=$(shell date +'%Y%m%d%H%M%S'); \

+			t=$(shell date +'m%d09/20/10M%S'); \

 		   cp -p $(srcdir)/libsdp.conf \

 				$(DESTDIR)$(sysconfdir)/libsdp.conf.$$t; \

 			echo "NOTE: existing libsdp.conf was not updated."; \

diff -r de0231b8e245 Makefile.in

--- a/Makefile.in	Tue Feb 23 22:30:48 2016 -0800

+++ b/Makefile.in	Tue Feb 23 22:30:49 2016 -0800

@@ -59,6 +59,12 @@

 	install-recursive installcheck-recursive installdirs-recursive \

 	pdf-recursive ps-recursive uninstall-info-recursive \

 	uninstall-recursive

+am__installdirs = "$(DESTDIR)$(man3libdir)" "$(DESTDIR)$(man5dir)"

+man3libdir = $(mandir)/man3lib

+man5dir = $(mandir)/man5

+NROFF = nroff

+man_MANS = man/libsdp.3lib man/libsdp.conf.5

+MANS = $(man_MANS)

 ETAGS = etags

 CTAGS = ctags

 DIST_SUBDIRS = $(SUBDIRS)

@@ -114,8 +120,6 @@

 LIBOBJS = @LIBOBJS@

 LIBS = @LIBS@

 LIBTOOL = @LIBTOOL@

-LINUX_BUILD_FALSE = @LINUX_BUILD_FALSE@

-LINUX_BUILD_TRUE = @LINUX_BUILD_TRUE@

 LN_S = @LN_S@

 LTLIBOBJS = @LTLIBOBJS@

 MAINT = @MAINT@

@@ -131,11 +135,8 @@

 PACKAGE_VERSION = @PACKAGE_VERSION@

 PATH_SEPARATOR = @PATH_SEPARATOR@

 RANLIB = @RANLIB@

-SED = @SED@

 SET_MAKE = @SET_MAKE@

 SHELL = @SHELL@

-SOLARIS_BUILD_FALSE = @SOLARIS_BUILD_FALSE@

-SOLARIS_BUILD_TRUE = @SOLARIS_BUILD_TRUE@

 STRIP = @STRIP@

 VERSION = @VERSION@

 WANT_LIBSDP_SYS_FALSE = @WANT_LIBSDP_SYS_FALSE@

@@ -185,7 +186,7 @@

 sysconfdir = @sysconfdir@

 target_alias = @target_alias@

 SUBDIRS = src

-EXTRA_DIST = libsdp.spec.in libsdp.conf

+EXTRA_DIST = libsdp.spec.in libsdp.conf libsdp.3lib libsdp.conf.5

 all: config.h

 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

@@ -252,6 +253,96 @@

 distclean-libtool:

 	-rm -f libtool

 uninstall-info-am:

+install-man5: $(man5_MANS) $(man_MANS)

+	@$(NORMAL_INSTALL)

+	test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"

+	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \

+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \

+	for i in $$l2; do \

+	  case "$$i" in \

+	    *.5*) list="$$list $$i" ;; \

+	  esac; \

+	done; \

+	for i in $$list; do \

+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \

+	  else file=$$i; fi; \

+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \

+	  case "$$ext" in \

+	    5*) ;; \

+	    *) ext='5' ;; \

+	  esac; \

+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \

+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \

+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \

+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \

+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \

+	done

+uninstall-man5:

+	@$(NORMAL_UNINSTALL)

+	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \

+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \

+	for i in $$l2; do \

+	  case "$$i" in \

+	    *.5*) list="$$list $$i" ;; \

+	  esac; \

+	done; \

+	for i in $$list; do \

+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \

+	  case "$$ext" in \

+	    5*) ;; \

+	    *) ext='5' ;; \

+	  esac; \

+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \

+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \

+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \

+	  echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \

+	  rm -f "$(DESTDIR)$(man5dir)/$$inst"; \

+	done

+install-man3lib: $(man3lib_MANS) $(man_MANS)

+	@$(NORMAL_INSTALL)

+	test -z "$(man3libdir)" || $(mkdir_p) "$(DESTDIR)$(man3libdir)"

+	@list='$(man3lib_MANS) $(dist_man3lib_MANS) $(nodist_man3lib_MANS)'; \

+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \

+	for i in $$l2; do \

+	  case "$$i" in \

+	    *.3lib*) list="$$list $$i" ;; \

+	  esac; \

+	done; \

+	for i in $$list; do \

+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \

+	  else file=$$i; fi; \

+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \

+	  case "$$ext" in \

+	    3lib*) ;; \

+	    *) ext='3lib' ;; \

+	  esac; \

+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \

+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \

+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \

+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3libdir)/$$inst'"; \

+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3libdir)/$$inst"; \

+	done

+uninstall-man3lib:

+	@$(NORMAL_UNINSTALL)

+	@list='$(man3lib_MANS) $(dist_man3lib_MANS) $(nodist_man3lib_MANS)'; \

+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \

+	for i in $$l2; do \

+	  case "$$i" in \

+	    *.3lib*) list="$$list $$i" ;; \

+	  esac; \

+	done; \

+	for i in $$list; do \

+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \

+	  case "$$ext" in \

+	    3lib*) ;; \

+	    *) ext='3lib' ;; \

+	  esac; \

+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \

+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \

+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \

+	  echo " rm -f '$(DESTDIR)$(man3libdir)/$$inst'"; \

+	  rm -f "$(DESTDIR)$(man3libdir)/$$inst"; \

+	done

 # This directory's subdirectories are mostly independent; you can cd

 # into them and run `make' without going through this Makefile.

@@ -531,19 +622,23 @@

 	       $(distcleancheck_listfiles) ; \

 	       exit 1; } >&2

 check-am: all-am

-check: check-recursive

-all-am: Makefile config.h

+check: installmandirs check-recursive

+all-am: Makefile config.h installmandirs

+installmandirs:

+	for dir in "$(DESTDIR)$(man3libdir)" "$(DESTDIR)$(man5dir)"; do \

+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \

+	done

 installdirs: installdirs-recursive

 installdirs-am:

-install: install-recursive

+install: install-man install-recursive

 install-exec: install-exec-recursive

-install-data: install-data-recursive

+install-data: install-data-am install-data-recursive

 uninstall: uninstall-recursive

 install-am: all-am

 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am

-installcheck: installcheck-recursive

+installcheck: install-man installcheck-recursive

 install-strip:

 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \

 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \

@@ -579,16 +674,16 @@

 info-am:

-install-data-am:

+install-data-am: install-man

 	@$(NORMAL_INSTALL)

 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook

+install-man: install-man5 install-man3lib

+

 install-exec-am:

 install-info: install-info-recursive

-install-man:

-

 installcheck-am:

 maintainer-clean: maintainer-clean-recursive

@@ -609,11 +704,14 @@

 ps-am:

-uninstall-am: uninstall-info-am

+uninstall-am: uninstall-man uninstall-info-am

 uninstall-info: uninstall-info-recursive

-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \

+uninstall-man: uninstall-man5 uninstall-man3lib

+

+.PHONY: installmandirs $(RECURSIVE_TARGETS) CTAGS GTAGS all \

+	all-am am--refresh check \

 	check-am clean clean-generic clean-libtool clean-recursive \

 	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \

 	dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \

@@ -622,12 +720,14 @@

 	distuninstallcheck dvi dvi-am html html-am info info-am \

 	install install-am install-data install-data-am \

 	install-data-hook install-exec install-exec-am install-info \

-	install-info-am install-man install-strip installcheck \

+	install-info-am install-man install-man3lib install-man5 \

+	install-strip installcheck \

 	installcheck-am installdirs installdirs-am maintainer-clean \

 	maintainer-clean-generic maintainer-clean-recursive \

 	mostlyclean mostlyclean-generic mostlyclean-libtool \

 	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \

-	uninstall uninstall-am uninstall-info-am

+	uninstall uninstall-am uninstall-info-am uninstall-man \

+	uninstall-man3lib uninstall-man5

 dist-hook: libsdp.spec

@@ -635,9 +735,9 @@

 install-data-hook:

 	if test -e $(DESTDIR)$(sysconfdir)/libsdp.conf; then \

-		diff -q $(srcdir)/libsdp.conf $(DESTDIR)$(sysconfdir)/libsdp.conf 1> /dev/null; \

+		diff $(srcdir)/libsdp.conf $(DESTDIR)$(sysconfdir)/libsdp.conf 1> /dev/null; \

 		if test $$? == 1; then \

-			t=$(shell date +'%Y%m%d%H%M%S'); \

+			t=$(shell date +'m%d01/26/11M%S'); \

 		   cp -p $(srcdir)/libsdp.conf \

 				$(DESTDIR)$(sysconfdir)/libsdp.conf.$$t; \

 			echo "NOTE: existing libsdp.conf was not updated."; \

@@ -648,7 +748,11 @@

 			mkdir -p $(DESTDIR)$(sysconfdir); \

 		fi; \

 		cp -p $(srcdir)/libsdp.conf $(DESTDIR)$(sysconfdir)/libsdp.conf; \

-	fi

+	fi; \

+	cd $(DESTDIR)$(mandir)/man3lib && \

+	$(RM) libssdp.3lib && \

+	cd $(DESTDIR)$(mandir)/man5 && \

+	$(RM) libssdp.conf.5

 # Tell versions [3.59,3.63) of GNU make to not export all variables.

 # Otherwise a system limit (for SysV at least) may be exceeded.

 .NOEXPORT:

diff -r de0231b8e245 README

--- a/README	Tue Feb 23 22:30:48 2016 -0800

+++ b/README	Tue Feb 23 22:30:49 2016 -0800

@@ -13,14 +13,12 @@

 libsdp.so isn't setup automatically. it can be used in one of 2 ways:

 1) LD_PRELOAD environment variable. Setting this to the name of the

    library you want to use will cause it to be preloaded.

-2) Adding the name of the library into /etc/ld.so.preload. This will

-   cause the library to be preloaded for every executable that is linked

-   with libc.

-

+2) Adding the name of the library  using crle(1).

+   

 The library should be installed in a directory in which the dynamic loader

-searches for shared libraries (as specified by LD_LIBRARY_PATH,

-/etc/ld.so.conf, etc). Alternatively, you can specify the full path to the 

-library that you want to use in LD_PRELOAD or /etc/ld.so.preload as described 

+searches for shared libraries (as specified by LD_LIBRARY_PATH, crle(1)

+, etc). Alternatively, you can specify the full path to the 

+library that you want to use in LD_PRELOAD or crle(1) described 

 above.

 The last option cant be used if you have multiple library versions

@@ -29,7 +27,7 @@

 lib (the 32 bit version) and lib64 directories and LD_RELOAD the libsdp.so.

 This way the correct 32/64bit libsdp.so will be selected. 

 For example running ssh over SDP with OFED distribution from bash this can be written:

-LD_LIBRARY_PATH=/usr/local/ofed/lib64:/usr/local/ofed/lib LD_PRELOAD=libsdp.so ssh

+LD_LIBRARY_PATH=/usr/lib/secure/64/:/usr/lib/secure LD_PRELOAD=libsdp.so ssh

 CONFIGURATION:

 --------------

@@ -39,6 +37,13 @@

 * selective mode where it uses a configuration file to select which sockets

   will be using SDP and which will not.

+Note:

+	both of these modes are designed to work with both IPv4 qand IPv6.

+	But only IPv4 works currently, because Solaris SDP with IPv6,

+	does not use AF_INET_SDP. (Note in Linux, the underlying SDP kernel

+	implementation does not support IPv6.)

+

+

 For real world applications where communication with X, authentication, 

 DNS and other servers connected through TCP is required the selective mode

 is required.

@@ -49,20 +54,11 @@

 * the configuration file does not include any address family rule

 For information on how to configure libsdp, see libsdp.conf, which is installed

-in $(sysconfdir) (usually /usr/local/etc or /etc). The user can further control

+in /etc). The user can further control

 the file to be used for configuration by setting the environment variable:

 LIBSDP_CONFIG_FILE

 LIMITATIONS:

 ------------

-1. Applications statically linked with libc will not allow dynamic pre-loading

-   to port these applications to use SDP one needs to replace specific socket 

-   calls (within the application) with AF_INET_SDP and recompile.

-2. If for some reason the dynamic linker fail to pre-load libc before the 

-   libsdp.so is initialized or it does not support RTDL_NEXT, libsdp will 

-   fail to find the libc socket API. To overcome this situation a simple 

-   implementation of hijacking "socket" call is provided in libsdp_sys.

-   This partial implementation does not support any configuration and is 

-   limited to i386 architecture.

-3. Non-blocking connect in "both" mode defaults to SDP. Specific rules might be

+1. Non-blocking connect in "both" mode defaults to SDP. Specific rules might be

    needed for applications to operate properly.

diff -r de0231b8e245 libsdp.conf

--- a/libsdp.conf	Tue Feb 23 22:30:48 2016 -0800

+++ b/libsdp.conf	Tue Feb 23 22:30:49 2016 -0800

@@ -22,8 +22,8 @@

 #

 # By default we let all servers and client try SDP first.

 # to exclude SDP add "use tcp" rules before these defaults.

-use both server * *:*

-use both client * *:*

+use sdp server * *:*

+use sdp client * *:*

 #

 #

 ##############################################################################

diff -r de0231b8e245 src/Makefile.am

--- a/src/Makefile.am	Tue Feb 23 22:30:48 2016 -0800

+++ b/src/Makefile.am	Tue Feb 23 22:30:49 2016 -0800

@@ -7,9 +7,6 @@

 libsdp_la_SOURCES = log.c match.c port.c config_parser.c config_scanner.c

 libsdp_la_LDFLAGS = -version-info 1 -ldl -lc

-if SOLARIS_BUILD

-libsdp_la_LDFLAGS += -lsocket

-endif

 libsdp_sys_la_SOURCES = socket.c

 libsdp_sys_la_LDFLAGS = -version-info 1

diff -r de0231b8e245 src/Makefile.in

--- a/src/Makefile.in	Tue Feb 23 22:30:48 2016 -0800

+++ b/src/Makefile.in	Tue Feb 23 22:30:49 2016 -0800

@@ -37,7 +37,6 @@

 POST_UNINSTALL = :

 build_triplet = @build@

 host_triplet = @host@

-@SOLARIS_BUILD_TRUE@am__append_1 = -lsocket

 subdir = src

 DIST_COMMON = $(nobase_include_HEADERS) $(srcdir)/Makefile.am \

 	$(srcdir)/Makefile.in

@@ -55,7 +54,7 @@

   esac;

 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"

-libLTLIBRARIES_INSTALL = $(INSTALL)

+libLTLIBRARIES_INSTALL = $(INSTALL) -m 755

 LTLIBRARIES = $(lib_LTLIBRARIES)

 libsdp_la_LIBADD =

 am_libsdp_la_OBJECTS = log.lo match.lo port.lo config_parser.lo \

@@ -144,12 +143,10 @@

 SED = @SED@

 SET_MAKE = @SET_MAKE@

 SHELL = @SHELL@

-SOLARIS_BUILD_FALSE = @SOLARIS_BUILD_FALSE@

-SOLARIS_BUILD_TRUE = @SOLARIS_BUILD_TRUE@

 STRIP = @STRIP@

 VERSION = @VERSION@

 WANT_LIBSDP_SYS_FALSE = @WANT_LIBSDP_SYS_FALSE@

-WANT_LIBSDP_SYS_TRUE = @WANT_LIBSDP_SYS_TRUE@

+#WANT_LIBSDP_SYS_TRUE = @WANT_LIBSDP_SYS_TRUE@

 YACC = @YACC@

 ac_ct_AR = @ac_ct_AR@

 ac_ct_CC = @ac_ct_CC@

@@ -195,7 +192,7 @@

 sysconfdir = @sysconfdir@

 target_alias = @target_alias@

 lib_LTLIBRARIES = libsdp.la $(LIB_SDP_SYS)

-@WANT_LIBSDP_SYS_TRUE@LIB_SDP_SYS = libsdp_sys.la

+#@WANT_LIBSDP_SYS_TRUE@LIB_SDP_SYS = libsdp_sys.la

 AM_CFLAGS = -Wall -DSYSCONFDIR=\"$(sysconfdir)\"

 libsdp_la_SOURCES = log.c match.c port.c config_parser.c config_scanner.c

 libsdp_la_LDFLAGS = -version-info 1 -ldl -lc $(am__append_1)

diff -r de0231b8e245 src/libsdp.h

--- a/src/libsdp.h	Tue Feb 23 22:30:48 2016 -0800

+++ b/src/libsdp.h	Tue Feb 23 22:30:49 2016 -0800

@@ -27,7 +27,9 @@

 /*

  * SDP specific includes

  */

+#if !(defined(__SVR4) && defined(__sun))

 #include "linux/sdp_inet.h"

+#endif

 /* --------------------------------------------------------------------- */

 /* library static and global variables                                   */

diff -r de0231b8e245 src/log.c

--- a/src/log.c	Tue Feb 23 22:30:48 2016 -0800

+++ b/src/log.c	Tue Feb 23 22:30:49 2016 -0800

@@ -79,20 +79,16 @@

 	switch ( __sdp_log_type ) {

 	case SDP_LOG_SYSLOG:

 		sprintf( extra_format, "%s[%d] libsdp %s ",

-					program_invocation_short_name, getpid(  ), format );

+					program_invocation_short_name, (int)getpid(  ), format );

 		vsyslog( LOG_USER | LOG_NOTICE, extra_format, ap );

 		break;

 	case SDP_LOG_FILE:

 		timeval = time(NULL);

-#ifdef SOLARIS_BUILD

-		ctime_r(&timeval, timestr, sizeof timestr);

-#else

                 ctime_r(&timeval, timestr);

-#endif

 		timestr[strlen(timestr)-1] = '\0';

 		sprintf( extra_format, "%s %s[%d] libsdp %s ",

 					timestr, program_invocation_short_name,

-					getpid(  ), format );

+					(int)getpid(  ), format );

 		if ( __sdp_log_file == NULL ) {

 			vfprintf( stderr, extra_format, ap );

 #if 0									  /* might slow everything too much? */

diff -r de0231b8e245 src/match.c

--- a/src/match.c	Tue Feb 23 22:30:48 2016 -0800

+++ b/src/match.c	Tue Feb 23 22:30:49 2016 -0800

@@ -39,7 +39,9 @@

 #include <netinet/in.h>

 #include <arpa/inet.h>

 #include <sys/types.h>

+#if !(defined(__SVR4) && defined(__sun))

 #include <linux/types.h>

+#endif

 /*

  * SDP specific includes

@@ -87,8 +89,13 @@

 	snprintf( buf, len, "use %s %s %s:%s", target, prog, addr_buf, ports_buf );

 }

+#if !(defined(__SVR4) && defined(__sun))

 static inline int __ipv6_prefix_equal(const __be32 *a1, const __be32 *a2,

 				      unsigned int prefixlen)

+#else

+static inline int __ipv6_prefix_equal(const uint32_t *a1, const uint32_t *a2,

+				      unsigned int prefixlen)

+#endif

 {

 	unsigned pdw, pbi;

@@ -109,7 +116,11 @@

 				    const struct in6_addr *a2,

 				    unsigned int prefixlen)

 {

+#if !(defined(__SVR4) && defined(__sun))

 	return __ipv6_prefix_equal(a1->s6_addr32, a2->s6_addr32,

+#else

+	return __ipv6_prefix_equal(a1->_S6_un._S6_u32, a2->_S6_un._S6_u32,

+#endif

 				   prefixlen);

 }

diff -r de0231b8e245 src/port.c

--- a/src/port.c	Tue Feb 23 22:30:48 2016 -0800

+++ b/src/port.c	Tue Feb 23 22:30:49 2016 -0800

@@ -29,7 +29,10 @@

 #  include <config.h>

 #endif							/* HAVE_CONFIG_H */

-#ifdef SOLARIS_BUILD

+#if defined(__SVR4) && defined(__sun)

+

+#define AF_INET6_SDP	34	/*  should be defined in socket.h but isn't */

+

 /* Our prototypes for ioctl, get*name and accept do not strictly

    match the headers - we use the following lines to move the header

    versions 'out of the way' temporarily. */

@@ -39,8 +42,9 @@

 #define accept __real_accept

 #define FASYNC 0