diff options
author | Norbert Preining <norbert@preining.info> | 2020-09-20 03:03:26 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-09-20 03:03:26 +0000 |
commit | 1f457376b478257b88d4a857f5ec1b6155442dd7 (patch) | |
tree | 2a06a60551dea362cf8cb0cb0ba66c78608717c4 /support/dktools/itadmin.ctr | |
parent | ac690ca29ad5bf8a5203a65fd6252f7b564f4727 (diff) |
CTAN sync 202009200303
Diffstat (limited to 'support/dktools/itadmin.ctr')
-rw-r--r-- | support/dktools/itadmin.ctr | 107 |
1 files changed, 63 insertions, 44 deletions
diff --git a/support/dktools/itadmin.ctr b/support/dktools/itadmin.ctr index f60d2c5835..fefe9c9107 100644 --- a/support/dktools/itadmin.ctr +++ b/support/dktools/itadmin.ctr @@ -2,7 +2,7 @@ copyright owner = Dirk Krause copyright year = 2012-xxxx -license = bsd +SPDX-License-Identifier: BSD-3-Clause @@ -343,6 +343,12 @@ typedef struct { int hlh; /**< Flag: Have localhost entry. */ int ukoma; /**< Flag: Use koma-script. */ int rel; /**< Release lease on shutdown. */ + int m_p; /**< Flag: Markers for points. */ + int m_vl; /**< Flag: Markers for vlan. */ + int m_sn; /**< Flag: Markers for subnets. */ + int m_gr; /**< Flag: Markers for groups. */ + int m_po; /**< Flag: Markers for pools. */ + int m_ho; /**< Flag: Markers for hosts. */ } itadmin_job; @@ -781,9 +787,7 @@ itadmin_mem_lictype_new( @param pk Primary key from licenses table (unused). @param order Order ID or tracking information (may be NULL). @param notes Additional notes (may be NULL). - @param d_del Delivery date (may be NULL). @param i_del Delivery note ID (may be NULL). - @param d_inv Invoice date (may be NULL). @param i_inv Invoice ID (may be NULL). @param prod Software product. @param ltype License type. @@ -797,9 +801,7 @@ itadmin_mem_license_new( unsigned long pk, char const *order, char const *notes, - itadmin_date *d_del, char const *i_del, - itadmin_date *d_inv, char const *i_inv, itadmin_swprod *prod, itadmin_lictype *ltype, @@ -1175,10 +1177,7 @@ itadmin_register_lictype( @param co_s Computer on which the license is used. @param lt_s License type. @param li_no Optional note for the license. - @param sr_s Software reseller. - @param li_dd Delivery date. @param li_nd Delivery note number. - @param li_di Invoide date. @param li_ni Invoice number. @return 1 on success, 0 on error. */ @@ -1192,10 +1191,7 @@ itadmin_register_license( char const *co_s, char const *lt_s, char const *li_no, - char const *sr_s, - itadmin_date *li_dd, char const *li_nd, - itadmin_date *li_di, char const *li_ni ); @@ -1334,16 +1330,6 @@ itadmin_comp_swprod(void const *l, void const *r, int cr); @param l Left structure. @param r Right structure, object, or name. @param cr Comparison criteria - (0=type/type by sn, 1=type/name). - @return Comparison result. -*/ -int -itadmin_comp_user(void const *l, void const *r, int cr); - -/** Compare structures for license type. - @param l Left structure. - @param r Right structure, object, or name. - @param cr Comparison criteria (0=license/license by product). @return Comparison result. */ @@ -1491,12 +1477,10 @@ itadmin_tool_table_line_start( ); /** Separate two items in a table. - @param job Job structure. @param os Output stream. */ void itadmin_tool_table_line_sep_rows( - itadmin_job *job, dk3_stream_t *os ); @@ -1507,7 +1491,6 @@ itadmin_tool_table_line_sep_rows( */ void itadmin_tool_table_line_finish( - itadmin_job *job, dk3_stream_t *os, int pb ); @@ -1575,7 +1558,6 @@ itadmin_tool_check_same_user(itadmin_user *us, itadmin_host *co); */ void itadmin_tool_write_section( - itadmin_job *job, dk3_stream_t *os, char const * const *sect ); @@ -1894,15 +1876,15 @@ Bring your own device, use DHCP # # 23: # -This is a ``bring your own device'' system, not owned by our organizational +Not sucject to license management. # # 24: # -unit. +This device is private property (BYOD), not owned by our organizational unit. # # 25: # -This host is not owned by our organizational unit, it is a computer outside. +This host is outside our responsibility. # # 26: # @@ -1914,7 +1896,7 @@ need for communication between our computers and this system. # # 28: # -IP address dynamically assigned to computers. +Organizational unit not responsible for correct licensing. # # 29: Parent groups # @@ -1926,7 +1908,7 @@ Subgroups # # 31: Additional network interface # -Additional network interface. +UNUSED # # 32: Member hosts for netgroups # @@ -2760,6 +2742,39 @@ Illegal license type (short name): " # 309: ERROR: Failed to reset sensitive memory range! # Failed to reset sensitive memory range! +# +# 310: Info The device owner is responsible. +# +The device owner is responsible for correct licensing. +# +# 311/312 +# +This IP address is assigned dynamically to different computers by DHCP. +Licenses are listed below real computer names. +# +# 313 +# +This is an additional network interface for a computer. +# +# 314-317 +# +UNUSED +This is just a network interface of a non-computer device (i.e. printer, +web cam, measurement device, oscilloscope, control unit...) without +software requring license accounting. +# +# 318-320 +# +Reserved IP address and host name. +This combination of IP address and host name ist not yet in use, +they are reserved for later use. +# +# 321 Device no longer in use. +# +Retired, this device is no longer in use. +# +# +# $!end }; @@ -2776,7 +2791,7 @@ This software uses code from the following projects, either directly or by linking a library: dktools DK tools and libraries - See http://dktools.sourceforge.net for information. + See http://sourceforge.net/p/dktools/wiki/Home/ for information. MySQL MySQL client library. See http://www.mysql.com for information. @@ -3387,7 +3402,7 @@ to see the license conditions. SEE ALSO -http://dktools.sourceforge.net +http://sourceforge.net/p/dktools/wiki/itadmin/ $!end }; @@ -3545,6 +3560,12 @@ itadmin_job_init( job->hlh = 0; job->ukoma = 0; job->rel = 0; + job->m_p = 1; + job->m_vl = 1; + job->m_sn = 1; + job->m_gr = 1; + job->m_po = 1; + job->m_ho = 0; if(*(msg[76]) == dkT('.')) { job->gdate = 1; } } @@ -3672,7 +3693,7 @@ itadmin_job_up(itadmin_job *job) ); f_utf8 = 0; if(DK3_ENCODING_UTF8 == dk3app_get_encoding(job->app)) { f_utf8 = 1; } - job->uc2l = dk3uc2lat_open_app(NULL, 0, f_utf8, job->app); + job->uc2l = dk3uc2lat_open_app(NULL, f_utf8, job->app); if(!(job->uc2l)) { back = 0; } return back; } @@ -3884,16 +3905,15 @@ itadmin_process_arguments(itadmin_job *job) /** Show version number. - @param job Job structure. */ static void -itadmin_show_version(itadmin_job *job) +itadmin_show_version(void) { dk3sf_fputs(itadmin_kw_noloc[2], stdout); dk3sf_fputs(DKT_VERSION_DK, stdout); dk3sf_fputc(dkT('\n'), stdout); -#if !(DK3_HAVE_MYSQL_MYSQL_H || DK3_HAVE_MYSQL_H) +#if !(DK3_HAVE_MARIADB_MYSQL_H || DK3_HAVE_MYSQL_MYSQL_H || DK3_HAVE_MYSQL_H) dk3app_log_1(job->app, DK3_LL_ERROR, job->msg, 167); #endif } @@ -3913,12 +3933,11 @@ itadmin_show_help(itadmin_job *job) /** Show one text section, used to show license terms. - @param job Job structure. @param ltxt License text to show. */ static void -itadmin_show_license_section(itadmin_job *job, dkChar const * const *ltxt) +itadmin_show_license_section(dkChar const * const *ltxt) { dkChar const * const *sptr; sptr = ltxt; @@ -3935,11 +3954,11 @@ itadmin_show_license_section(itadmin_job *job, dkChar const * const *ltxt) */ static void -itadmin_show_license(itadmin_job *job) +itadmin_show_license(void) { - itadmin_show_license_section(job, itadmin_license_overview); - itadmin_show_license_section(job, itadmin_license_dktools); - itadmin_show_license_section(job, itadmin_license_mysql); + itadmin_show_license_section(itadmin_license_overview); + itadmin_show_license_section(itadmin_license_dktools); + itadmin_show_license_section(itadmin_license_mysql); } @@ -4051,10 +4070,10 @@ itadmin_run_or_help(itadmin_job *job) job->exval = 0; dk3sf_initialize_stdout(); if((job->cmd) & ITADMIN_CMD_VERSION) { $? ". version" - itadmin_show_version(job); + itadmin_show_version(); } if((job->cmd) & ITADMIN_CMD_LICENSE_TERMS) { $? ". license" - itadmin_show_license(job); + itadmin_show_license(); } if((job->cmd) & ITADMIN_CMD_HELP) { $? ". help" itadmin_show_help(job); |