Merge the rest of security.i into samba.dcerpc.security.