Ignore:
Timestamp:
Jun 6, 2016, 8:53:52 PM (10 years ago)
Author:
Silvan Scherrer
Message:

Samba Server: update trunk to version 3.6.25, fix some more crlf issues

Location:
trunk/server
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/server

  • trunk/server/source3/librpc/gen_ndr/rap.h

    r874 r916  
    356356        uint8_t group_name[21];
    357357        uint8_t reserved1;
    358         const char * comment;/* [unique,flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */
     358        const char * comment;/* [] */
    359359};
    360360
    … …  
    366366        uint16_t priv;
    367367        const char * home_dir;/* [unique,flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */
    368         const char * comment;/* [unique,flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */
     368        const char * comment;/* [] */
    369369        uint16_t userflags;
    370         const char * logon_script;/* [unique,flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */
     370        const char * logon_script;/* [] */
    371371};
    372372
    … …  
    376376        uint32_t installcode;
    377377        uint16_t process_num;
    378         const char * comment;/* [unique,flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */
     378        const char * comment;/* [] */
    379379};
    380380
    … …  
    387387        uint8_t reserved1;
    388388        uint16_t share_type;
    389         const char * comment;/* [unique,flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */
     389        const char * comment;/* [] */
    390390};
    391391
    … …  
    398398        uint16_t maximum_users;
    399399        uint16_t active_users;
    400         const char * path;/* [unique,flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */
     400        const char * path;/* [] */
    401401        uint8_t password[9];
    402402        uint8_t reserved2;
    … …  
    418418        uint8_t version_minor;
    419419        uint32_t servertype;
    420         const char * comment;/* [unique,flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */
     420        const char * comment;/* [] */
    421421};
    422422
    … …  
    459459        uint16_t JobPosition;
    460460        enum rap_PrintJStatusCode JobStatus;
    461         const char * JobStatusString;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     461        const char * JobStatusString;/* [] */
    462462        uint16_t JobStatusStringHigh;
    463463        time_t TimeSubmitted;
    464464        uint32_t JobSize;
    465         const char * JobCommentString;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     465        const char * JobCommentString;/* [] */
    466466        uint16_t JobCommentStringHigh;
    467467};
    … …  
    493493        const char * JobCommentString;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
    494494        uint16_t JobCommentStringHigh;
    495         const char * DocumentName;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     495        const char * DocumentName;/* [] */
    496496        uint16_t DocumentNameHigh;
    497497        const char * NotifyName;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
    498498        uint16_t NotifyNameHigh;
    499         const char * DataType;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     499        const char * DataType;/* [] */
    500500        uint16_t DataTypeHigh;
    501501        const char * PrintParameterString;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
    … …  
    503503        const char * StatusString;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
    504504        uint16_t StatusStringHigh;
    505         const char * QueueName;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     505        const char * QueueName;/* [] */
    506506        uint16_t QueueNameHigh;
    507         const char * PrintProcessorName;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     507        const char * PrintProcessorName;/* [] */
    508508        uint16_t PrintProcessorNameHigh;
    509         const char * PrintProcessorParams;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     509        const char * PrintProcessorParams;/* [] */
    510510        uint16_t PrintProcessorParamsHigh;
    511         const char * DriverName;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     511        const char * DriverName;/* [] */
    512512        uint16_t DriverNameHigh;
    513513        const char * DriverDataOffset;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
    … …  
    555555        const char * PrintProcessorDllName;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
    556556        uint16_t PrintProcessorDllNameHigh;
    557         const char * PrintDestinationsName;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     557        const char * PrintDestinationsName;/* [] */
    558558        uint16_t PrintDestinationsNameHigh;
    559         const char * PrintParameterString;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     559        const char * PrintParameterString;/* [] */
    560560        uint16_t PrintParameterStringHigh;
    561         const char * CommentString;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     561        const char * CommentString;/* [] */
    562562        uint16_t CommentStringHigh;
    563563        enum rap_PrintQStatusCode PrintQStatus;
    … …  
    581581        const char * PrintProcessorDllName;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
    582582        uint16_t PrintProcessorDllNameHigh;
    583         const char * PrintParameterString;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     583        const char * PrintParameterString;/* [] */
    584584        uint16_t PrintParameterStringHigh;
    585         const char * CommentString;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     585        const char * CommentString;/* [] */
    586586        uint16_t CommentStringHigh;
    587587        enum rap_PrintQStatusCode PrintQStatus;
    … …  
    589589        const char * Printers;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
    590590        uint16_t PrintersHigh;
    591         const char * DriverName;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     591        const char * DriverName;/* [] */
    592592        uint16_t DriverNameHigh;
    593         const char * PrintDriverData;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     593        const char * PrintDriverData;/* [] */
    594594        uint16_t PrintDriverDataHigh;
    595595}/* [public] */;
    … …  
    612612        struct rap_PrintQueue4 info4;/* [case(4)] */
    613613        struct rap_PrintQueue5 info5;/* [case(5)] */
    614 }/* [public,nodiscriminant] */;
     614}/* [] */;
    615615
    616616enum rap_JobInfoParamNum
    … …  
    647647union rap_JobInfoParam {
    648648        uint16_t value;/* [case(RAP_PARAM_JOBNUM)] */
    649         const char * string;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),case(RAP_PARAM_USERNAME)] */
     649        const char * string;/* [)] */
    650650        uint32_t value4;/* [case(RAP_PARAM_TIMESUBMITTED)] */
    651651}/* [nodiscriminant] */;
    … …  
    671671
    672672struct rap_PrintDest3 {
    673         const char * PrinterName;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     673        const char * PrinterName;/* [] */
    674674        uint16_t PrinterNameHigh;
    675         const char * UserName;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     675        const char * UserName;/* [] */
    676676        uint16_t UserNameHigh;
    677677        const char * LogAddr;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
    … …  
    681681        const char * StatusStringName;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
    682682        uint16_t PrintQueueNameHigh;
    683         const char * Comment;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     683        const char * Comment;/* [] */
    684684        uint16_t CommentHigh;
    685         const char * Drivers;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     685        const char * Drivers;/* [] */
    686686        uint16_t DriversHigh;
    687687        uint16_t Time;
    … …  
    694694        struct rap_PrintDest2 info2;/* [case(2)] */
    695695        struct rap_PrintDest3 info3;/* [case(3)] */
    696 }/* [public,nodiscriminant] */;
     696}/* [] */;
    697697
    698698struct rap_NetUserInfo0 {
    … …  
    721721        time_t PasswordAge;
    722722        enum rap_UserPriv Priv;
    723         const char * HomeDir;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     723        const char * HomeDir;/* [] */
    724724        uint16_t HomeDirHigh;
    725         const char * Comment;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     725        const char * Comment;/* [] */
    726726        uint16_t CommentHigh;
    727727        uint16_t Flags;
    … …  
    757757        time_t PasswordAge;
    758758        enum rap_UserPriv Priv;
    759         const char * HomeDir;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     759        const char * HomeDir;/* [] */
    760760        uint16_t HomeDirHigh;
    761         const char * Comment;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     761        const char * Comment;/* [] */
    762762        uint16_t CommentHigh;
    763763        uint16_t Flags;
    … …  
    765765        uint16_t ScriptPathHigh;
    766766        enum rap_AuthFlags AuthFlags;
    767         const char * FullName;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     767        const char * FullName;/* [] */
    768768        uint16_t FullNameHigh;
    769769        const char * UsrComment;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
    … …  
    771771        const char * pParms;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
    772772        uint16_t pParmsHigh;
    773         const char * WorkStations;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     773        const char * WorkStations;/* [] */
    774774        uint16_t WorkStationsHigh;
    775775        time_t LastLogon;
    … …  
    791791        const char *Name;/* [charset(DOS)] */
    792792        uint8_t Pad;
    793         const char * Comment;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     793        const char * Comment;/* [] */
    794794        uint16_t CommentHigh;
    795         const char * UsrComment;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     795        const char * UsrComment;/* [] */
    796796        uint16_t UsrCommentHigh;
    797         const char * FullName;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     797        const char * FullName;/* [] */
    798798        uint16_t FullNameHigh;
    799799};
    … …  
    804804        const char * Comment;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
    805805        uint16_t CommentHigh;
    806         const char * UsrComment;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     806        const char * UsrComment;/* [] */
    807807        uint16_t UsrCommentHigh;
    808         const char * FullName;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     808        const char * FullName;/* [] */
    809809        uint16_t FullNameHigh;
    810810        enum rap_UserPriv Priv;
    811811        enum rap_AuthFlags AuthFlags;
    812812        time_t PasswordAge;
    813         const char * HomeDir;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     813        const char * HomeDir;/* [] */
    814814        uint16_t HomeDirHigh;
    815         const char * Parms;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     815        const char * Parms;/* [] */
    816816        uint16_t ParmsHigh;
    817817        time_t LastLogon;
    … …  
    819819        uint16_t BadPWCount;
    820820        uint16_t NumLogons;
    821         const char * LogonServer;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM),relative_short] */
     821        const char * LogonServer;/* [] */
    822822        uint16_t LogonServerHigh;
    823823        uint16_t CountryCode;
    … …  
    837837        struct rap_NetUserInfo10 info10;/* [case(10)] */
    838838        struct rap_NetUserInfo11 info11;/* [case(11)] */
    839 }/* [public,nodiscriminant] */;
     839}/* [] */;
    840840
    841841struct rap_session_info_2 {
    … …  
    856856union rap_session_info {
    857857        struct rap_session_info_2 info2;/* [case(2)] */
    858 }/* [public,nodiscriminant] */;
     858}/* [] */;
    859859
    860860struct rap_TimeOfDayInfo {
    … …  
    911911                uint16_t bufsize;
    912912                uint32_t servertype;
    913                 const char * domain;/* [ref,flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */
     913                const char * domain;/* [] */
    914914        } in;
    915915
Note: See TracChangeset for help on using the changeset viewer.