← Back to branch summary

~ubuntu-branches/ubuntu/maverick/samba/maverick-security

« back to all changes in this revision

Viewing changes to librpc/gen_ndr/cli_svcctl.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-01-29 06:16:15 UTC
  • mfrom: (0.27.9 upstream) (0.34.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100129061615-37hs6xqpsdhjq3ld
Tags: 2:3.4.5~dfsg-1ubuntu1
https://launchpad.net/bugs/462169
https://launchpad.net/bugs/493565
* Merge from debian testing.  Remaining changes:
  + debian/patches/VERSION.patch:
    - set SAMBA_VERSION_SUFFIX to Ubuntu.
  + debian/smb.conf:
    - Add "(Samba, Ubuntu)" to server string.
    - Comment out the default [homes] share, and add a comment about "valid users = %s"
      to show users how to restrict access to \\server\username to only username.
    - Set 'usershare allow guests', so that usershare admins are allowed to create
      public shares in additon to authenticated ones.
    - add map to guest = Bad user, maps bad username to gues access.
  + debian/samba-common.conf:
    - Do not change priority to high if dhclient3 is installed.
    - Use priority medium instead of high for the workgroup question.
  + debian/mksambapasswd.awk:
    - Do not add user with UID less than 1000 to smbpasswd.
  + debian/control: 
    - Make libswbclient0 replace/conflict with hardy's likewise-open.
    - Don't build against ctdb, since its not in main yet.
  + debian/rules:
    - Enable "native" PIE hardening.
    - Add BIND_NOW to maximize benefit of RELRO hardening.
  + Add ufw integration:
    - Created debian/samba.ufw.profile.
    - debian/rules, debian/samba.dirs, debian/samba.files: install
  + Add apoort hook:
    - Created debian/source_samba.py.
    - debian/rules, debian/samba.dirs, debian/samba-common-bin.files: install
  + debian/rules, debian/samba.if-up: allow "NetworkManager" as a recognized address
    family... it's obviously /not/ an address family, but it's what gets
    sent when using NM, so we'll cope for now.  (LP: #462169). Taken from karmic-proposed.
  + debian/control: Recommend keyutils for smbfs (LP: #493565)
  + Dropped patches:
    - debian/patches/security-CVE-2009-3297.patch: No longer needed
    - debian/patches/fix-too-many-open-files.patch: No longer needed

Show diffs side-by-side

added added

removed removed

Lines of Context:
librpc/gen_ndr/cli_svcctl.c
225
225
        }
226
226
 
227
227
        /* Return variables */
228
 
        memcpy(buffer, r.out.buffer, r.in.offered * sizeof(*buffer));
 
228
        memcpy(buffer, r.out.buffer, (r.in.offered) * sizeof(*buffer));
229
229
        *needed = *r.out.needed;
230
230
 
231
231
        /* Return result */
685
685
        }
686
686
 
687
687
        /* Return variables */
688
 
        memcpy(service_status, r.out.service_status, r.in.offered * sizeof(*service_status));
 
688
        memcpy(service_status, r.out.service_status, (r.in.offered) * sizeof(*service_status));
689
689
        *needed = *r.out.needed;
690
690
        *services_returned = *r.out.services_returned;
691
691
 
742
742
        }
743
743
 
744
744
        /* Return variables */
745
 
        memcpy(service, r.out.service, r.in.offered * sizeof(*service));
 
745
        memcpy(service, r.out.service, (r.in.offered) * sizeof(*service));
746
746
        *needed = *r.out.needed;
747
747
        *services_returned = *r.out.services_returned;
748
748
        if (resume_handle && r.out.resume_handle) {
1385
1385
        }
1386
1386
 
1387
1387
        /* Return variables */
1388
 
        memcpy(service, r.out.service, r.in.offered * sizeof(*service));
 
1388
        memcpy(service, r.out.service, (r.in.offered) * sizeof(*service));
1389
1389
        *needed = *r.out.needed;
1390
1390
        *services_returned = *r.out.services_returned;
1391
1391
        if (resume_handle && r.out.resume_handle) {
1534
1534
        }
1535
1535
 
1536
1536
        /* Return variables */
1537
 
        memcpy(query, r.out.query, r.in.offered * sizeof(*query));
 
1537
        memcpy(query, r.out.query, (r.in.offered) * sizeof(*query));
1538
1538
        *needed = *r.out.needed;
1539
1539
 
1540
1540
        /* Return result */
1961
1961
        }
1962
1962
 
1963
1963
        /* Return variables */
1964
 
        memcpy(buffer, r.out.buffer, r.in.offered * sizeof(*buffer));
 
1964
        memcpy(buffer, r.out.buffer, (r.in.offered) * sizeof(*buffer));
1965
1965
        *needed = *r.out.needed;
1966
1966
 
1967
1967
        /* Return result */
2012
2012
        }
2013
2013
 
2014
2014
        /* Return variables */
2015
 
        memcpy(buffer, r.out.buffer, r.in.offered * sizeof(*buffer));
 
2015
        memcpy(buffer, r.out.buffer, (r.in.offered) * sizeof(*buffer));
2016
2016
        *needed = *r.out.needed;
2017
2017
 
2018
2018
        /* Return result */
2063
2063
        }
2064
2064
 
2065
2065
        /* Return variables */
2066
 
        memcpy(buffer, r.out.buffer, r.in.offered * sizeof(*buffer));
 
2066
        memcpy(buffer, r.out.buffer, (r.in.offered) * sizeof(*buffer));
2067
2067
        *needed = *r.out.needed;
2068
2068
 
2069
2069
        /* Return result */
2122
2122
        }
2123
2123
 
2124
2124
        /* Return variables */
2125
 
        memcpy(services, r.out.services, r.in.offered * sizeof(*services));
 
2125
        memcpy(services, r.out.services, (r.in.offered) * sizeof(*services));
2126
2126
        *needed = *r.out.needed;
2127
2127
        *service_returned = *r.out.service_returned;
2128
2128
        if (resume_handle && r.out.resume_handle) {
2187
2187
        }
2188
2188
 
2189
2189
        /* Return variables */
2190
 
        memcpy(services, r.out.services, r.in.offered * sizeof(*services));
 
2190
        memcpy(services, r.out.services, (r.in.offered) * sizeof(*services));
2191
2191
        *needed = *r.out.needed;
2192
2192
        *service_returned = *r.out.service_returned;
2193
2193
        if (resume_handle && r.out.resume_handle) {