Changeset 2614

Timestamp:

01/11/06 20:09:45 (18 years ago)

Author:

jerome

Message:

Integrated Brandon Holbrook's patch to waitprinter.sh to
accept SNMP commmunity and version as parameters.

Location:

pykota/trunk

Files:

• bin/waitprinter.sh (modified) (4 diffs)
• CREDITS (modified) (1 diff)
• NEWS (modified) (1 diff)

pykota/trunk/bin/waitprinter.sh

@@ -39 +39 @@
 function printer_status_get() {
         local printer="$1"
-        PRINTER_STATUS=`snmpget -v1 -c public -Ov ${printer} HOST-RESOURCES-MIB::hrPrinterStatus.1`
+        local comm="$2"
+        local version="$3"
+        PRINTER_STATUS=`snmpget -v${version} -c ${comm} -Ov ${printer} HOST-RESOURCES-MIB::hrPrinterStatus.1`
 }
 #--------------------------------------------------------------------------
 function printing_wait() {
         local printer="$1"
-        log_msg "CICLE: printing_wait"
+        local comm="$2"
+        local version="$3"
+        log_msg "CYCLE: printing_wait"
         while [ 1 ]; do
-                printer_status_get "${printer}"
+                printer_status_get "${printer}" "${comm}" "${version}"
                 log_msg "${PRINTER_STATUS}"
                 echo "${PRINTER_STATUS}" | grep -iE '(printing)|(idle)' >/dev/null && break
@@ -55 +59 @@
 function idle_wait() {
         local printer="$1" idle_num=0 idle_flag=0
-        log_msg "CICLE: idle_wait"
+        local comm="$2"
+        local version="$3"
+        log_msg "CYCLE: idle_wait"
         while [ ${idle_num} -lt ${IDLE_WAIT_NUM} ]; do
-                printer_status_get "${printer}"
+                printer_status_get "${printer}" "${comm}" "${version}"
                 log_msg "${PRINTER_STATUS}"
                 idle_flag=0
@@ -72 +78 @@
 function main() {
         local printer="$1"
+        local comm="$2"
+        local version="$3"
+        if [ x${comm} == "x" ]; then
+                comm="public"
+        fi
+        if [ x${version} == "x" ]; then
+                version="1"
+        fi
         log_msg "BEGIN"
         ##log_msg "`ls -la /var/spool/{cups,samba}`"
         log_msg "Pykota Phase: ${PYKOTAPHASE}"
         if [ x$PYKOTASTATUS != "xCANCELLED" ] && [ x$PYKOTAACTION = "xALLOW" ] && [ x$PYKOTAPHASE = "xAFTER" ] ; then
-                printing_wait "${printer}"
+                printing_wait "${printer}" "${comm}" "${version}"
         fi
-        idle_wait "${printer}" #in any case
+        idle_wait "${printer}" "${comm}" "${version}" #in any case
         ##log_msg "`ls -la /var/spool/{cups,samba}`"
         log_msg "END"
@@ -86 +100 @@
 #==========================================================================
 PRINTER_STATUS=""
-main "$1"
+main "$1" "$2" "$3"
 exit $?

pykota/trunk/CREDITS

@@ -241 +241 @@
   - Jamuel P. Starkey - GCI Systems - Secondary MX server.
   - Kris Kopicki - Walford Anglican School for Girls Inc. - Wrote pykotadmin.
+  - Brandon Holbrook - Mississipi State University : improved waitprinter.sh
 
 ==============================================================

pykota/trunk/NEWS

@@ -24 +24 @@
     - 1.24alpha6 :
     
+        - Now waitprinter.sh accepts SNMP version number and 
+          community name as arguments, thanks to Brandon
+          Holbrook.
+          
         - Now command line errors and Ctrl+C repectively cause
           PyKota commands to exit with status -2 and -3.