Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/net-snmp-57/patches/053.20191950.dladm_proto_change.patch
author Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
Fri, 11 Dec 2015 03:49:26 -0800
changeset 5867 445e2cf1c845
parent 3641 components/net-snmp/patches/053.20191950.dladm_proto_change.patch@5e7228d629ab
permissions -rw-r--r--
PSARC/2014/169 Net-snmp upgrade to version 5.7.2.1 15685782 SUNBT7005330 NET-SNMP upgrade to 5.7.2.1 15705167 SUNBT7030994 find memory leaks for snmp-notify after doing libfmnotif
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3641
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
     1
 
This patch is a solaris specific one which fixes a build issue
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
     2
 
related to change in the prototype of a dladm function. This has
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
     3
 
not been submitted to the community.
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
     4
 
--- net-snmp-5.4.1.old/agent/mibgroup/kernel_sunos5.c	2015-01-08 06:55:57.165428600 -0600
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
     5
 
+++ net-snmp-5.4.1/agent/mibgroup/kernel_sunos5.c	2015-01-08 06:50:09.992840500 -0600
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
     6
 
@@ -62,6 +62,7 @@
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
     7
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
     8
 
 #include <libdladm.h>
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
     9
 
 #include <libdllink.h>
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
    10
 
+#include <libnetcfg.h>
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
    11
 
 /*-
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
    12
 
  * Includes of local application header files
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
    13
 
  */
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
    14
 
@@ -1733,7 +1734,12 @@
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
    15
 
         dladm_phys_attr_t dpa;
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
    16
 
         dladm_handle_t handle;
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
    17
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
    18
 
-        if (dladm_open(&handle, NULL) != DLADM_STATUS_OK) {
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
    19
 
+#ifdef NETADM_ACTIVE_PROFILE
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
    20
 
+        if (dladm_open(&handle, NULL)
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
    21
 
+#else
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
    22
 
+        if (dladm_open(&handle)
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
    23
 
+#endif
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
    24
 
+            != DLADM_STATUS_OK) {
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
    25
 
             DEBUGMSGTL(("kernel_sunos5","dladm_open failed "
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
    26
 
                        "with errno=%d\n",errno));
5e7228d629ab 20191950 net-snmp needs to update dladm_open function call.
Lijo George<lijo.x.george@oracle.com>
parents:
diff changeset 
    27
 
             return (-1);
upstream/oracle/userland-gate