← Back to branch summary

~ubuntu-branches/ubuntu/trusty/net-snmp/trusty

« back to all changes in this revision

Viewing changes to agent/mibgroup/mibII/system_mib.c

  • Committer: Bazaar Package Importer
  • Author(s): Steve Kowalik
  • Date: 2007-12-08 14:59:50 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20071208145950-u1tykhpw56nyzqik
Tags: 5.4.1~dfsg-4ubuntu1
* Merge from debian unstable.
* Remaining Ubuntu changes:
  - Remove stop links from rc0 and rc6
  - Munge Maintainer field as per spec.
* Ubuntu changes dropped:
  - Symlink common files between the packages, CDBS ought to handle that
    for us automatically.
* The latest Debian changes has dropped history from the changelog. Slot in
  the Ubuntu changes as best I can. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
agent/mibgroup/mibII/system_mib.c
64
64
         *********************/
65
65
 
66
66
#define SYS_STRING_LEN  256
67
 
char            version_descr[SYS_STRING_LEN] = VERS_DESC;
68
 
char            sysContact[SYS_STRING_LEN] = SYS_CONTACT;
69
 
char            sysName[SYS_STRING_LEN] = SYS_NAME;
70
 
char            sysLocation[SYS_STRING_LEN] = SYS_LOC;
 
67
char            version_descr[SYS_STRING_LEN] = NETSNMP_VERS_DESC;
 
68
char            sysContact[SYS_STRING_LEN] = NETSNMP_SYS_CONTACT;
 
69
char            sysName[SYS_STRING_LEN] = NETSNMP_SYS_NAME;
 
70
char            sysLocation[SYS_STRING_LEN] = NETSNMP_SYS_LOC;
71
71
oid             sysObjectID[MAX_OID_LEN];
72
72
size_t          sysObjectIDLength;
73
73
 
504
504
        *write_method = writeSystem;
505
505
        return (u_char *) sysLocation;
506
506
    case SYSSERVICES:
507
 
#if NO_DUMMY_VALUES
 
507
#if NETSNMP_NO_DUMMY_VALUES
508
508
        if (!sysServicesConfiged)
509
509
            return NULL;
510
510
#endif