--- a/components/krb5/patches/016-solaris_paths.patch	Fri Sep 23 11:19:39 2016 -0700
+++ b/components/krb5/patches/016-solaris_paths.patch	Mon Sep 26 15:58:55 2016 -0700
@@ -9,7 +9,6 @@
 # so that may require modification of this patch in a future update.
 # Patch source: in-house
 #
-diff --git a/src/include/osconf.hin b/src/include/osconf.hin
 --- a/src/include/osconf.hin
 +++ b/src/include/osconf.hin
 @@ -40,6 +40,8 @@
@@ -77,7 +76,6 @@
  
  /*
   * GSS mechglue
-diff --git a/src/kadmin/cli/k5srvutil.sh b/src/kadmin/cli/k5srvutil.sh
 --- a/src/kadmin/cli/k5srvutil.sh
 +++ b/src/kadmin/cli/k5srvutil.sh
 @@ -73,7 +73,7 @@ delete_keys() {
@@ -89,7 +87,6 @@
  interactive=0
  keysalts=""
  
-diff --git a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.h b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.h
 --- a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.h
 +++ b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.h
 @@ -32,7 +32,7 @@