[PHP-CVS] cvs: php4(PHP_4_3) /ext/snmp snmp.c

[Jani Taskinen]

sniper          Fri Jan 24 04:53:16 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php4/ext/snmp      snmp.c 
  Log:
  MFH: Fixed bug: #20857, snmpset() fails
  
Index: php4/ext/snmp/snmp.c
diff -u php4/ext/snmp/snmp.c:1.70.2.3 php4/ext/snmp/snmp.c:1.70.2.4
--- php4/ext/snmp/snmp.c:1.70.2.3       Tue Dec 31 11:35:21 2002
+++ php4/ext/snmp/snmp.c        Fri Jan 24 04:53:16 2003
@@ -18,7 +18,7 @@
 |          Harrie Hazewinkel <[EMAIL PROTECTED]>                      |
 +----------------------------------------------------------------------+
 */
-/* $Id: snmp.c,v 1.70.2.3 2002/12/31 16:35:21 sebastian Exp $ */
+/* $Id: snmp.c,v 1.70.2.4 2003/01/24 09:53:16 sniper Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -197,7 +197,7 @@
 static void php_snmp_internal(INTERNAL_FUNCTION_PARAMETERS,
                int st,
                struct snmp_session *session,
-               char *objid) 
+               char *objid, char type, char* value) 
 {
        struct snmp_session *ss;
        struct snmp_pdu *pdu=NULL, *response;
@@ -211,8 +211,6 @@
        char buf[2048];
        char buf2[2048];
        int keepwalking=1;
-       char type = (char) 0;
-       char *value = (char *) 0;
        char *err;
 
        if (st >= 2) { /* walk */
@@ -267,7 +265,12 @@
                } else if (st == 11) {
                        pdu = snmp_pdu_create(SNMP_MSG_SET);
                        if (snmp_add_var(pdu, name, name_length, type, value)) {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not 
add variable: %s", name);
+#ifdef HAVE_NET_SNMP
+                               snprint_objid(buf, sizeof(buf), name, name_length);
+#else
+                               sprint_objid(buf, name, name_length);
+#endif
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not 
+add variable: %s %c %s", buf, type, value);
                                snmp_close(ss);
                                RETURN_FALSE;
                        }
@@ -466,7 +469,7 @@
        
        session.authenticator = NULL;
 
-       php_snmp_internal(INTERNAL_FUNCTION_PARAM_PASSTHRU, st, &session, 
Z_STRVAL_PP(a3));
+       php_snmp_internal(INTERNAL_FUNCTION_PARAM_PASSTHRU, st, &session, 
+Z_STRVAL_PP(a3), type, value);
 }
 /* }}} */
 
@@ -836,7 +839,7 @@
        session.retries = retries;
        session.timeout = timeout;
 
-       php_snmp_internal(INTERNAL_FUNCTION_PARAM_PASSTHRU, st, &session, 
Z_STRVAL_PP(a8));
+       php_snmp_internal(INTERNAL_FUNCTION_PARAM_PASSTHRU, st, &session, 
+Z_STRVAL_PP(a8), type, value);
 }
 /* }}} */
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php